diff options
Diffstat (limited to 'openecomp-be')
623 files changed, 37959 insertions, 29179 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml index dc5f1f6273..e2967174e2 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp-heat/nodes.yml @@ -134,6 +134,75 @@ node_types: type: string description: Status of the service instance status: SUPPORTED + + org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface: + derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface + properties: + virtual_machine_interface_refs: + description: List of virtual machine interface. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + name: + description: Virtual Machine Sub Interface VLAN name + type: string + status: SUPPORTED + required: false + virtual_network_refs: + description: List of virtual networks. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + virtual_machine_interface_properties: + description: virtual machine interface properties. + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties + status: SUPPORTED + required: false + virtual_machine_interface_allowed_address_pairs: + description: Virtual Machine Sub Interface allowed address pairs. + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + status: SUPPORTED + required: false + virtual_machine_interface_mac_addresses: + description: List of mac addresses. + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress + status: SUPPORTED + required: false + security_group_refs: + description: List of security groups. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + port_tuple_refs: + description: List of port tuples. + type: list + status: SUPPORTED + entry_schema: + type: string + required: false + attributes: + fq_name: + description: The FQ name of the Virtual Network. + type: string + status: SUPPORTED + show: + description: All attributes. + type: string + status: SUPPORTED + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface: derived_from: org.openecomp.resource.cp.nodes.network.CP properties: @@ -194,6 +263,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -681,6 +751,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml index 5b3e2a8dfc..b8f946f161 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml @@ -392,6 +392,49 @@ node_types: - 0 - 2 + org.openecomp.resource.cp.nodes.network.v2.SubInterface: + derived_from: tosca.nodes.Root + properties: + ip_address: + description: Allow the user to set a fixed IP address. Note that this address is a request to the provider which they will attempt to fulfill but may not be able to dependent on the network the port is associated with. + type: string + required: false + order: + description: 'The order of the NIC on the compute instance (e.g. eth2). Note: + when binding more than one port to a single compute (aka multi vNICs) and + ordering is desired, it is *mandatory* that all ports will be set with an + order value and. The order values must represent a positive, arithmetic + progression that starts with 0 (e.g. 0, 1, 2, ..., n).' + type: integer + default: 0 + required: false + constraints: + - greater_or_equal: 0 + is_default: + description: Set is_default=true to apply a default gateway route on the running compute instance to the associated network gateway. Only one port that is associated to single compute node can set as default=true. + type: boolean + default: false + required: false + ip_range_start: + description: Defines the starting IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network. + type: string + required: false + ip_range_end: + description: Defines the ending IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network. + type: string + required: false + attributes: + ip_address: + description: The IP address would be assigned to the associated compute instance. + type: string + requirements: + - subinterface_link: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + - binding: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + org.openecomp.resource.cp.nodes.network.SubInterface: derived_from: tosca.nodes.network.Port @@ -402,6 +445,11 @@ node_types: org.openecomp.resource.cp.nodes.network.Port: derived_from: tosca.nodes.network.Port properties: + subinterface_indicator: + description: identifies if Port is having Sub Interface + type: boolean + required: false + default: false network_role_tag: description: Must correlate to the set of defined “network-role�? tag identifiers from the associated HEAT template type: string @@ -727,6 +775,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -850,6 +899,7 @@ node_types: - UNBOUNDED valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface tosca.nodes.nfv.NS.vEPC_NS: derived_from: tosca.nodes.nfv.NS diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java index 56c647129f..8927149dfc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java @@ -16,6 +16,7 @@ package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to; +import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext; import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData; @@ -27,15 +28,18 @@ public class UnifiedCompositionTo { private ServiceTemplate substitutionServiceTemplate; private List<UnifiedCompositionData> unifiedCompositionDataList; private TranslationContext context; + private NodeTemplate nodeTemplate; public UnifiedCompositionTo(ServiceTemplate serviceTemplate, ServiceTemplate substitutionServiceTemplate, List<UnifiedCompositionData> unifiedCompositionDataList, - TranslationContext context) { + TranslationContext context, + NodeTemplate nodeTemplate) { this.serviceTemplate = serviceTemplate; this.substitutionServiceTemplate = substitutionServiceTemplate; this.unifiedCompositionDataList = unifiedCompositionDataList; this.context = context; + this.nodeTemplate = nodeTemplate; } public ServiceTemplate getServiceTemplate() { @@ -70,4 +74,12 @@ public class UnifiedCompositionTo { public void setContext(TranslationContext context) { this.context = context; } + + public NodeTemplate getNodeTemplate() { + return nodeTemplate; + } + + public void setNodeTemplate(NodeTemplate nodeTemplate) { + this.nodeTemplate=nodeTemplate; + } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java index 7e54f97d28..639e76d646 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java @@ -115,6 +115,8 @@ public class UnifiedCompositionService { private static final Map<String, ImplementationConfiguration> unifiedCompositionImplMap; private static final EnumMap<UnifiedCompositionEntity, String> unifiedSubstitutionNodeTemplateIdGeneratorImplMap; + private static final String SUB_INTERFACE_INDICATOR_PROPERTY = "subinterface_indicator"; + private final ConsolidationService consolidationService = new ConsolidationService(); static { Configuration config = ConfigurationManager.lookup(); @@ -134,8 +136,6 @@ public class UnifiedCompositionService { .SUB_INTERFACE_NEW_NODE_TEMPLATE_ID_GENERATOR_IMPL); } - private final ConsolidationService consolidationService = new ConsolidationService(); - private static List<EntityConsolidationData> getPortConsolidationDataList( List<String> portIds, List<UnifiedCompositionData> unifiedCompositionDataList) { @@ -204,7 +204,7 @@ public class UnifiedCompositionService { computeNodeType, context); UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, - substitutionServiceTemplate, unifiedCompositionDataList, context); + substitutionServiceTemplate, unifiedCompositionDataList, context, null); handleSubInterfaces(unifiedCompositionTo); createOutputParameters(unifiedCompositionTo, computeNodeType); NodeType substitutionGlobalNodeType = @@ -281,7 +281,7 @@ public class UnifiedCompositionService { return; } UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, null, - unifiedCompositionDataList, context); + unifiedCompositionDataList, context, null); unifiedCompositionDataList.forEach(unifiedCompositionData -> createSubInterfaceVfcInstanceGroup(abstractNodeTemplateId, unifiedCompositionTo, unifiedCompositionData)); } @@ -2134,9 +2134,8 @@ public class UnifiedCompositionService { List<UnifiedCompositionData> unifiedCompositionDataList, TranslationContext context) { nodeTemplate.setProperties(new HashedMap()); - handleNodeTemplateProperties(serviceTemplate, nodeTemplate, substitutionServiceTemplate, - unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData, - unifiedCompositionDataList, context); + UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, substitutionServiceTemplate,unifiedCompositionDataList, context, nodeTemplate); + handleNodeTemplateProperties(unifiedCompositionTo, unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData); //Add enrich properties from openecomp node type as input to global and substitution ST handleNodeTypeProperties(substitutionServiceTemplate, entityConsolidationDataList, nodeTemplate, unifiedCompositionEntity, @@ -2144,62 +2143,66 @@ public class UnifiedCompositionService { } - private void handleNodeTemplateProperties(ServiceTemplate serviceTemplate, - NodeTemplate nodeTemplate, - ServiceTemplate substitutionServiceTemplate, + private void handleNodeTemplateProperties(UnifiedCompositionTo unifiedCompositionTo, UnifiedCompositionEntity unifiedCompositionEntity, List<EntityConsolidationData> entityConsolidationDataList, ComputeTemplateConsolidationData - computeTemplateConsolidationData, - List<UnifiedCompositionData> unifiedCompositionDataList, - TranslationContext context) { + computeTemplateConsolidationData + ) { List<String> propertiesWithIdenticalVal = consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity); for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) { String nodeTemplateId = entityConsolidationData.getNodeTemplateId(); Optional<List<String>> indexVarProperties = - context.getIndexVarProperties(ToscaUtil.getServiceTemplateFileName(serviceTemplate), - nodeTemplateId); + unifiedCompositionTo.getContext().getIndexVarProperties(ToscaUtil.getServiceTemplateFileName(unifiedCompositionTo.getServiceTemplate()), + nodeTemplateId); Map<String, Object> properties = - DataModelUtil.getNodeTemplateProperties(serviceTemplate, nodeTemplateId); + DataModelUtil.getNodeTemplateProperties(unifiedCompositionTo.getServiceTemplate(), + nodeTemplateId); if (MapUtils.isEmpty(properties)) { continue; } + if(unifiedCompositionEntity == UnifiedCompositionEntity.PORT + && entityConsolidationData instanceof PortTemplateConsolidationData) { + properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, true); + } + for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) { NodeType nodeTypeWithFlatHierarchy = - HeatToToscaUtil.getNodeTypeWithFlatHierarchy(nodeTemplate.getType(), serviceTemplate, - context); + HeatToToscaUtil.getNodeTypeWithFlatHierarchy(unifiedCompositionTo.getNodeTemplate().getType(), + unifiedCompositionTo.getServiceTemplate(), unifiedCompositionTo.getContext()); PropertyDefinition propertyDefinition = nodeTypeWithFlatHierarchy.getProperties().get(propertyEntry.getKey()); String propertyType = propertyDefinition.getType(); if (propertiesWithIdenticalVal.contains(propertyEntry.getKey())) { String parameterId = - updateIdenticalProperty(nodeTemplateId, propertyEntry.getKey(), nodeTemplate, - unifiedCompositionEntity, unifiedCompositionDataList); + updateIdenticalProperty(nodeTemplateId, propertyEntry.getKey(), + unifiedCompositionTo.getNodeTemplate(),unifiedCompositionEntity, unifiedCompositionTo.getUnifiedCompositionDataList()); addInputParameter( - parameterId, propertyType, - propertyType.equals(PropertyType.LIST.getDisplayName()) ? propertyDefinition - .getEntry_schema() : null, - substitutionServiceTemplate); + parameterId, propertyType, + propertyType.equals(PropertyType.LIST.getDisplayName()) ? propertyDefinition + .getEntry_schema() : null, + unifiedCompositionTo.getSubstitutionServiceTemplate()); } else if (indexVarProperties.isPresent() && indexVarProperties.get().contains(propertyEntry.getKey())) { //Handle index property - handleIndexVarProperty(propertyEntry.getKey(), propertyEntry.getValue(), nodeTemplate); + handleIndexVarProperty(propertyEntry.getKey(), propertyEntry.getValue(), + unifiedCompositionTo.getNodeTemplate()); } else { Optional<String> parameterId = - updateProperty(serviceTemplate, nodeTemplateId, nodeTemplate, propertyEntry, - unifiedCompositionEntity, computeTemplateConsolidationData, null, - unifiedCompositionDataList, - context); + updateProperty(unifiedCompositionTo.getServiceTemplate(), nodeTemplateId, unifiedCompositionTo.getNodeTemplate(), propertyEntry, + unifiedCompositionEntity, computeTemplateConsolidationData, null, + unifiedCompositionTo.getUnifiedCompositionDataList(), + unifiedCompositionTo.getContext()); parameterId.ifPresent( - parameterIdValue -> addPropertyInputParameter(propertyType, - substitutionServiceTemplate, - propertyDefinition.getEntry_schema(), parameterIdValue)); + parameterIdValue -> addPropertyInputParameter(propertyType, + unifiedCompositionTo.getSubstitutionServiceTemplate(), + propertyDefinition.getEntry_schema(), parameterIdValue)); } } } @@ -2638,7 +2641,7 @@ public class UnifiedCompositionService { UnifiedSubstitutionNodeTemplateIdGenerator nodeTemplateIdGenerator = CommonMethods.newInstance(nodeTemplateIdGeneratorImpl, UnifiedSubstitutionNodeTemplateIdGenerator.class); UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, null, - unifiedCompositionDataList, context); + unifiedCompositionDataList, context, null); Optional<String> generatedNodeTemplateId = nodeTemplateIdGenerator.generate(unifiedCompositionTo, nodeTemplateId); if (generatedNodeTemplateId.isPresent()) { newNodeTemplateId = generatedNodeTemplateId.get(); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java index a48e107370..7bd9106078 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java @@ -27,7 +27,7 @@ public class UnifiedCompositionNestedSingleCompute implements UnifiedComposition } UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, nestedServiceTemplate, - unifiedCompositionDataList, context); + unifiedCompositionDataList, context, null); for (UnifiedCompositionData unifiedCompositionData : unifiedCompositionDataList) { unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedCompositionData); String nestedNodeTemplateId = unifiedCompositionData.getNestedTemplateConsolidationData().getNodeTemplateId(); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java index 83b83d3353..1a31b52331 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java @@ -944,43 +944,6 @@ public class UnifiedCompositionServiceTest { checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)); } - @Ignore - public void testThreeNovaOfSameTypePreConditionFalse() throws IOException { - loadInputAndOutputData(BASE_DIRECTORY + "pattern1b/noConsolidation"); - - List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>(); - List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>(); - portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1)); - portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2)); - - UnifiedCompositionData unifiedCompositionData1 = - createCompositionData(FSB1_template, portTypeToIdList1); - addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1); - addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1); - unifiedCompositionDataList.add(unifiedCompositionData1); - - UnifiedCompositionData unifiedCompositionData2 = - createCompositionData(FSB2_template, portTypeToIdList1); - addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData2); - addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData2); - unifiedCompositionDataList.add(unifiedCompositionData2); - - portTypeToIdList1.remove(1); - UnifiedCompositionData unifiedCompositionData3 = - createCompositionData(FSB3_template, portTypeToIdList1); - addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData3); - addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData3); - unifiedCompositionDataList.add(unifiedCompositionData3); - - UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution = - new UnifiedCompositionSingleSubstitution(); - unifiedCompositionSingleSubstitution - .createUnifiedComposition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), null, - unifiedCompositionDataList, context); - - checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)); - } - @Test public void testUnifiedNestedCompositionOneComputeInNested() throws IOException { loadInputAndOutputData(BASE_DIRECTORY + "pattern4/oneNestedNode"); @@ -1007,7 +970,7 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001"); UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo( inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName), null, - context); + context, null); unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedComposition); checkSTResults(expectedOutserviceTemplates, nestedFileName, @@ -1050,11 +1013,13 @@ public class UnifiedCompositionServiceTest { UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001"); UnifiedCompositionTo unifiedCompositionTo1 = new UnifiedCompositionTo(inputServiceTemplates - .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null, context); + .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null, + context, null); unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo1, unifiedComposition); unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001"); UnifiedCompositionTo unifiedCompositionTo2 = new UnifiedCompositionTo(inputServiceTemplates - .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null, context); + .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null, + context, null); unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo2, unifiedComposition); checkSTResults(expectedOutserviceTemplates, nestedFileName1, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnectionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnectionTest.java index 86e9afbbe0..c5f655afbb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnectionTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VmInterfaceToNetResourceConnectionTest.java @@ -43,8 +43,6 @@ public class ContrailV2VmInterfaceToNetResourceConnectionTest extends BaseResour testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanToNetNestedConnection() throws Exception { inputFilesPath = "/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles"; @@ -64,8 +62,6 @@ public class ContrailV2VmInterfaceToNetResourceConnectionTest extends BaseResour testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanToNetMultiNestedConnection() throws Exception { inputFilesPath = @@ -85,8 +81,6 @@ public class ContrailV2VmInterfaceToNetResourceConnectionTest extends BaseResour testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanToSharedNetNestedConnection() throws Exception { inputFilesPath = "/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles"; @@ -115,8 +109,6 @@ public class ContrailV2VmInterfaceToNetResourceConnectionTest extends BaseResour testTranslation(); } - //todo - remove the ignore once we will support VMI as sub port - @Ignore @Test public void testTranslateVlanToNetSharedAddOnConnection() throws Exception { inputFilesPath = "/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles"; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java index 5750de5172..361888f74e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/ComputeNewNodeTemplateIdGeneratorTest.java @@ -46,7 +46,7 @@ public class ComputeNewNodeTemplateIdGeneratorTest extends BaseResourceTranslati @Test public void testGenerateNewComputeNodeTemplateId() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestComputeServiceTemplate(), null, null, - null); + null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, SERVER_PCM); if (nodeTemplateId.isPresent()) { @@ -60,7 +60,7 @@ public class ComputeNewNodeTemplateIdGeneratorTest extends BaseResourceTranslati public void testGenerateInvalidOriginalNodeTemplateId() { //node template with id is not present in the service template UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestComputeServiceTemplate(), null, null, - null); + null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, SERVER_PCM + "_invalid"); @@ -70,7 +70,7 @@ public class ComputeNewNodeTemplateIdGeneratorTest extends BaseResourceTranslati @Test public void testGenerateNullOriginalNodeTemplateId() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestComputeServiceTemplate(), null, null, - null); + null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, null); Assert.assertEquals(nodeTemplateId.isPresent(), false); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java index 1986ecae4e..ad39bb7148 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/PortNewNodeTemplateIdGeneratorTest.java @@ -58,7 +58,7 @@ public class PortNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationT @Test public void testGenerateNewPortNodeTemplateId() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestPortServiceTemplate(), null, - getUnifiedCompositionDataListWithOnePort(), null); + getUnifiedCompositionDataListWithOnePort(), null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, PCM_PORT_0); if (nodeTemplateId.isPresent()) { @@ -71,7 +71,7 @@ public class PortNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationT @Test public void testGeneratePortIdNotBoundToServer() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestInitPortServiceTemplate(), null, - getInitUnifiedCompositionDataList(), null); + getInitUnifiedCompositionDataList(), null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, PCM_PORT_0); Assert.assertEquals(false, nodeTemplateId.isPresent()); @@ -81,7 +81,7 @@ public class PortNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationT public void testGeneratePortIdMultiplePortsSameTypeToOneServer() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestPortServiceTemplateWithTwoPortsOfSameType(), null, - getUnifiedCompositionDataListWithTwoPortsOfSameType(), null); + getUnifiedCompositionDataListWithTwoPortsOfSameType(), null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, PCM_PORT_0); if (nodeTemplateId.isPresent()) { @@ -101,7 +101,7 @@ public class PortNewNodeTemplateIdGeneratorTest extends BaseResourceTranslationT @Test public void testGenerateInvalidOriginalNodeTemplateId() { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestPortServiceTemplate(), null, - getUnifiedCompositionDataListWithOnePort(), null); + getUnifiedCompositionDataListWithOnePort(), null, null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, PCM_PORT_0 + "_Invalid"); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java index 11b20fa0b1..63f12622f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/unifiedmodel/commands/SubInterfaceNewNodeTemplateIdGeneratorTest.java @@ -60,7 +60,7 @@ public class SubInterfaceNewNodeTemplateIdGeneratorTest extends BaseResourceTran @Test public void testGenerateNewSubInterfaceNodeTemplateId() throws IOException { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestInitSubInterfaceServiceTemplate(), null, - getUnifiedCompositionDataListWithOnePortAndSubInterface(), getContext(false)); + getUnifiedCompositionDataListWithOnePortAndSubInterface(), getContext(false), null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, VDBE_UNTR_1_SUBPORTS); if (nodeTemplateId.isPresent()) { @@ -74,7 +74,7 @@ public class SubInterfaceNewNodeTemplateIdGeneratorTest extends BaseResourceTran public void testGeneratePortIdMultipleSubInterfacesOfSameTypeToOnePort() throws IOException { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestSubInterfaceServiceTemplateMultipleVlan(), null, - getUnifiedCompositionDataListWithTwoSubInterfacesOfSameType(), getContext(true)); + getUnifiedCompositionDataListWithTwoSubInterfacesOfSameType(), getContext(true), null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, VDBE_UNTR_1_SUBPORTS); if (nodeTemplateId.isPresent()) { @@ -94,7 +94,7 @@ public class SubInterfaceNewNodeTemplateIdGeneratorTest extends BaseResourceTran @Test public void testGenerateInvalidOriginalNodeTemplateId() throws IOException { UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(getTestInitSubInterfaceServiceTemplate(), null, - getUnifiedCompositionDataListWithOnePortAndSubInterface(), getContext(false)); + getUnifiedCompositionDataListWithOnePortAndSubInterface(), getContext(false), null); Optional<String> nodeTemplateId = unifiedSubstitutionNodeTemplateIdGenerator.generate(unifiedCompositionTo, VDBE_UNTR_1_SUBPORTS + "_Invalid"); diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 83f1db7e2e..4bb275609f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -324,6 +324,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -482,4 +483,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 29f9f0e07e..701a5e87b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -202,6 +202,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -304,6 +305,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -427,6 +429,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -434,6 +437,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1033,6 +1037,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1290,6 +1295,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index a04551ad57..ef873af7b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -457,6 +457,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -464,6 +465,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -821,6 +823,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -834,6 +837,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -946,6 +950,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1268,6 +1273,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1689,6 +1695,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1760,6 +1767,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2238,6 +2246,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2380,6 +2389,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2415,6 +2425,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2530,6 +2541,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 6fd0ed7829..85dac74ae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -404,6 +404,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -417,6 +418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -843,6 +845,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -850,6 +853,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -869,6 +873,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1210,6 +1215,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4753f33ebd..c6020ac428 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -302,6 +302,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -455,4 +456,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 01f6f14f48..8430f65985 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -230,6 +230,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -414,6 +415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -524,4 +526,4 @@ node_types: type: tosca.capabilities.Scalable 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/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4753f33ebd..c6020ac428 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -302,6 +302,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -455,4 +456,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 83f1db7e2e..4bb275609f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -324,6 +324,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -482,4 +483,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/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 62e950b558..d05be23ba6 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 @@ -481,6 +481,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -527,6 +528,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -727,6 +729,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -814,6 +817,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1087,6 +1091,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1464,6 +1469,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 288f5fd2b4..afe8374ddc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -414,6 +414,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -421,6 +422,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,4 +478,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 24ab455388..2682002f72 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -415,6 +415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -422,6 +423,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -477,4 +479,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/MainServiceTemplate.yaml index 0fd3d769b3..c772011aa4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/MainServiceTemplate.yaml @@ -68,4 +68,4 @@ topology_template: members: - test_net1 - test_net - - test_nested + - test_nested
\ 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/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 8915357694..276d388db4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -303,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -373,6 +374,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -404,6 +406,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -513,6 +516,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -638,6 +642,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1313,6 +1318,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1643,6 +1649,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1650,6 +1657,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2030,6 +2038,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2043,6 +2052,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2294,6 +2304,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2542,6 +2553,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2709,6 +2721,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2884,6 +2897,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3277,6 +3291,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3284,6 +3299,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3598,6 +3614,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3953,6 +3970,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4150,6 +4168,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4157,6 +4176,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4438,4 +4458,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 909ec386cd..fe1958c2ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -231,6 +231,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -244,6 +245,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -818,6 +820,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -825,6 +828,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1209,6 +1213,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1294,4 +1299,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 25fd6ea864..1b396f22f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -329,6 +329,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -399,6 +400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -424,6 +426,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -532,6 +535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -656,6 +660,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1398,6 +1403,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1427,6 +1433,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1746,6 +1753,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1753,6 +1761,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2114,6 +2123,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2127,6 +2137,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2378,6 +2389,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2626,6 +2638,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2793,6 +2806,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2968,6 +2982,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3361,6 +3376,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3368,6 +3384,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3682,6 +3699,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4037,6 +4055,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4234,6 +4253,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4241,6 +4261,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4522,4 +4543,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 84a2824b76..8ab703915e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,40 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: - org.openecomp.resource.abstract.nodes.heat.nested: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: cmaui_names: @@ -55,6 +25,16 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + p3: + type: string + description: port resource + required: true + status: SUPPORTED + p4: + type: string + description: port resource + required: true + status: SUPPORTED template_PortTuple_LB1: type: string required: true @@ -123,80 +103,54 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 capabilities: - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - binding_template_VMInt_OAM_lb_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_template_VMInt_OAM_lb_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + feature_template_Vlan_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + feature_template_Vlan_1: + type: tosca.capabilities.Node 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/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index e8cb686316..9a387fb8ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: @@ -41,9 +11,42 @@ topology_template: jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network node_templates: + template_VMInt_OAM_lb_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: oam_sec_group_name + virtual_network_refs: + - get_input: p1 + virtual_machine_interface_properties: + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 + template_VMInt_OAM_lb_2: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: oam_sec_group_name + virtual_network_refs: + - get_input: p1 + - get_input: p2 + virtual_machine_interface_properties: + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 test_net1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -57,7 +60,7 @@ topology_template: network_name: get_input: jsa_net_name test_nested: - type: org.openecomp.resource.abstract.nodes.heat.nested + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable properties: @@ -65,23 +68,25 @@ topology_template: service_template_filter: substitute_service_template: nestedServiceTemplate.yaml p2: test_net1 + p3: template_VMInt_OAM_lb_1 + p4: template_VMInt_OAM_lb_2 requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_2 + relationship: tosca.relationships.network.BindsTo + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_1 + relationship: tosca.relationships.network.BindsTo groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -90,6 +95,8 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: + - template_VMInt_OAM_lb_1 + - template_VMInt_OAM_lb_2 - test_net1 - test_net - test_nested
\ 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/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 673fffdaf7..ac1b452a06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -58,6 +25,16 @@ topology_template: immutable: false type: string description: UID of OAM network + p3: + hidden: false + immutable: false + type: string + description: port resource + p4: + hidden: false + immutable: false + type: string + description: port resource template_PortTuple_LB1: hidden: false immutable: false @@ -127,60 +104,11 @@ topology_template: immutable: false type: string node_templates: - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_2: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p1 - - get_input: p2 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_2 + - get_input: p4 name: str_replace: template: $NAME$VLAN @@ -216,16 +144,11 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_2 - relationship: tosca.relationships.network.BindsTo template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 + - get_input: p3 name: str_replace: template: $NAME$VLAN @@ -260,11 +183,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo groups: nested_group: type: org.openecomp.groups.heat.HeatStack @@ -272,48 +190,33 @@ topology_template: heat_file: ../Artifacts/nested.yml description: cmaui server template for vMMSC members: - - template_VMInt_OAM_lb_1 - - template_VMInt_OAM_lb_2 - - server_cmaui - template_Vlan_2 - template_Vlan_1 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested capabilities: - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui: - - server_cmaui - - os - binding_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - binding - binding_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - binding - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable + feature_template_Vlan_2: + - template_Vlan_2 + - feature + feature_template_Vlan_1: + - template_Vlan_1 + - feature requirements: - link_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - link - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - link - link_template_Vlan_1: + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + dependency_template_Vlan_2: + - template_Vlan_2 + - dependency + dependency_template_Vlan_1: - template_Vlan_1 - - link - link_template_Vlan_2: + - dependency + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link + binding_template_Vlan_2: - template_Vlan_2 - - link
\ No newline at end of file + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding
\ 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/VlanToNetConnection/nested/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml index e68f16ec29..aac85f1d5e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/main.yml @@ -20,8 +20,32 @@ resources: name: {get_param: jsa_net_name} shared: True + template_VMInt_OAM_lb_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + + template_VMInt_OAM_lb_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + test_nested: type: nested.yml properties: p1: { get_resource: test_net} p2: { get_resource: test_net1} + p3: { get_resource: template_VMInt_OAM_lb_1} + p4: { get_resource: template_VMInt_OAM_lb_2} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml index b8ec5dd9d3..060bb5ff2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nested/inputfiles/nested.yml @@ -9,6 +9,12 @@ parameters: p2: type: string description: UID of OAM network + p3: + type: string + description: port resource + p4: + type: string + description: port resource security_group_name: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -49,16 +55,6 @@ parameters: subinterface_instance_index: type: number resources: - template_VMInt_OAM_lb_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] template_Vlan_1: type: OS::ContrailV2::VirtualMachineInterface @@ -101,18 +97,7 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - template_VMInt_OAM_lb_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p3 }] template_Vlan_2: type: OS::ContrailV2::VirtualMachineInterface @@ -155,15 +140,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 },{ get_param: p2 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_2 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p4 }]
\ 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/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 98c0195c9a..938e59adcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -5,6 +5,123 @@ imports: - openecomp_heat_index: file: openecomp-heat/_index.yml node_types: + org.openecomp.resource.abstract.nodes.heat.subinterface.nested4: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + cmaui_names: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + p1: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p2: + type: string + required: true + status: SUPPORTED + p3: + type: string + required: true + status: SUPPORTED + template_PortTuple_LB1: + type: string + required: true + status: SUPPORTED + lb_st_interface_type_oam: + type: string + required: true + status: SUPPORTED + oam_sec_group_name: + type: string + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + security_group_name: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + vlan_ids: + type: string + required: true + status: SUPPORTED + cmaui_image: + type: string + description: Image for CMAUI server + required: true + status: SUPPORTED + virtual_ipv6_address: + type: string + required: true + status: SUPPORTED + cmaui_flavor: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + lb_st_vlan_type_oam: + type: string + description: dummy + required: true + status: SUPPORTED + mac_address: + type: string + required: true + status: SUPPORTED + availability_zone_0: + type: string + description: availabilityzone name + required: true + status: SUPPORTED + subinterface_name_prefix: + type: string + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED + cmaui_oam_ips: + type: string + required: true + status: SUPPORTED + requirements: + - dependency_template_subint_oam_vmi_4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_template_subint_oam_vmi_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -93,20 +210,39 @@ node_types: required: true status: SUPPORTED requirements: + - dependency_template_VMInt_OAM_lb_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_server_cmaui: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - local_storage_server_cmaui: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage @@ -114,261 +250,1347 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2_test_nested2Level: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested3Level_test_nested2Level: + - dependency_server_cmaui_3_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_3_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_4_test_nested2Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_3_test_nested2Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_3_test_nested2Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested2Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_VMInt_OAM_lb_4_test_nested2Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2_test_nested2Level: + - link_template_VMInt_OAM_lb_4_test_nested2Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - os_server_cmaui_test_nested2Level: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + disk.device.write.requests.rate_server_cmaui: + type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.OperatingSystem + disk.device.allocation_server_cmaui: + type: org.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_server_cmaui_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + host_server_cmaui: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - host_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + network.incoming.bytes_template_VMInt_OAM_lb_2: + type: org.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_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Scalable + network.incoming.bytes_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + endpoint_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_4_test_nested2Level: + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.capacity_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - host_server_cmaui_test_nested2Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.write.requests_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.Endpoint.Admin + network.outpoing.packets_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.device.read.bytes_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_2: + os_server_cmaui: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_2: + type: org.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_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_2: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_1: + instance_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_server_cmaui: + type: org.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_cmaui: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_2: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - os_server_cmaui_test_nested3Level_test_nested2Level: + network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui: + type: org.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_cmaui: + type: org.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_server_cmaui: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_2: + type: org.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_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_template_VMInt_OAM_lb_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.usage_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_cmaui: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_cmaui: + type: org.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_cmaui: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + scalable_server_cmaui: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes.rate_server_cmaui: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_server_cmaui: + type: org.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_template_VMInt_OAM_lb_2: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_server_cmaui: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_cmaui: + type: org.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_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_2: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_2: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui: + type: org.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_server_cmaui: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_2_test_nested2Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_server_cmaui: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + memory_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + cpu.delta_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_2_test_nested2Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + host_server_cmaui_3_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_server_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_3_test_nested2Level: + type: org.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_server_cmaui: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_3_test_nested2Level: + binding_template_VMInt_OAM_lb_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_server_cmaui_test_nested2Level: - type: tosca.capabilities.Scalable + disk.write.requests_server_cmaui: + type: org.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_cmaui: - type: tosca.capabilities.network.Bindable + disk.write.requests.rate_server_cmaui_2_test_nested2Level: + type: org.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_cmaui_test_nested2Level: - type: tosca.capabilities.network.Bindable + disk.write.bytes_server_cmaui_2_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - type: tosca.capabilities.network.Bindable + feature_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_cmaui_3_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + type: org.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_cmaui_2_test_nested2Level: + type: tosca.capabilities.Container valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - tosca.nodes.SoftwareComponent occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -458,151 +1680,374 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_5_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_server_cmaui_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - local_storage_server_cmaui_2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - 0 + - UNBOUNDED + - dependency_template_VMInt_OAM_lb_5_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5_test_nested3Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6_test_nested3Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui_test_nested3Level: + - dependency_server_cmaui_3_test_nested3Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3_test_nested3Level: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested3Level: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_VMInt_OAM_lb_8_test_nested3Level: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_4: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_3: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_3: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_VMInt_OAM_lb_4: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - link_template_VMInt_OAM_lb_4: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + memory.usage_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.OperatingSystem + cpu_util_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_test_nested4Level_test_nested3Level: - type: tosca.capabilities.Scalable + disk.device.usage_server_cmaui_2: + type: org.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_cmaui_test_nested3Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_server_cmaui_test_nested3Level: - type: tosca.capabilities.Endpoint.Admin + disk.device.latency_server_cmaui_2: + type: org.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_server_cmaui: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + disk.root.size_server_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_4: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested3Level: + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_3: type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_4: + type: org.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_cmaui: + disk.read.requests_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_cmaui_2: + type: org.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_cmaui_2: + type: org.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_cmaui_3_test_nested3Level: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.allocation_server_cmaui_3_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - scalable_server_cmaui_test_nested3Level: - type: tosca.capabilities.Scalable + network.outpoing.packets_template_VMInt_OAM_lb_3: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_4: + type: org.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_cmaui_2: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_cmaui_2: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_template_VMInt_OAM_lb_4: + type: org.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_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -610,62 +2055,587 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + type: org.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_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_template_VMInt_OAM_lb_4: + type: org.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_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_server_cmaui_2: + type: org.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_cmaui_2: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + cpu_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.allocation_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + binding_server_cmaui_2: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + instance_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_test_nested3Level: - type: tosca.capabilities.OperatingSystem + scalable_server_cmaui_2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_3: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_2: + type: org.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_template_VMInt_OAM_lb_4: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_cmaui_2: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_4: + feature_template_VMInt_OAM_lb_4: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + binding_template_VMInt_OAM_lb_6_test_nested3Level: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - host_server_cmaui_test_nested4Level_test_nested3Level: + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + os_server_cmaui_2: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_2: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + os_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.OperatingSystem occurrences: - - 0 + - 1 - UNBOUNDED - binding_server_cmaui_test_nested4Level_test_nested3Level: + binding_server_cmaui_3_test_nested3Level: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_VMInt_OAM_lb_8_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_template_VMInt_OAM_lb_4: + type: org.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_template_VMInt_OAM_lb_5_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_3: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + instance_server_cmaui_2: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_8_test_nested3Level: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + vcpus_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_cmaui_2: + type: org.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_server_cmaui_2: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.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_template_VMInt_OAM_lb_6_test_nested3Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_server_cmaui_3_test_nested3Level: + type: org.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_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_3_test_nested3Level: + type: org.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_server_cmaui_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested3: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -757,123 +2727,165 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_5: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_5: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_7_test_nested4Level: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_5: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_template_VMInt_OAM_lb_8_test_nested4Level: - capability: tosca.capabilities.network.Linkable + - dependency_test_nested4Level: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - local_storage_server_cmaui_test_nested4Level: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - 0 + - UNBOUNDED + - dependency_template_subint_oam_vmi_4_test_nested4Level: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested4Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - dependency_template_VMInt_OAM_lb_6: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED - link_template_VMInt_OAM_lb_6: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - local_storage_server_cmaui: + - dependency_server_cmaui_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_server_cmaui_3: capability: tosca.capabilities.Attachment node: tosca.nodes.BlockStorage relationship: tosca.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: - capability: tosca.capabilities.network.Linkable + - dependency_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.Node node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 + - binding_template_VMInt_OAM_lb_8: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 capabilities: - scalable_server_cmaui_test_nested4Level: - type: tosca.capabilities.Scalable + disk.write.bytes.rate_server_cmaui_3: + type: org.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_cmaui: - type: tosca.capabilities.OperatingSystem + forwarder_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable + disk.device.write.bytes_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_7_test_nested4Level: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + forwarder_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED - endpoint_server_cmaui_test_nested4Level: - type: tosca.capabilities.Endpoint.Admin + feature_server_cmaui_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.device.usage_server_cmaui_3: + type: org.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_cmaui_test_nested4Level: - type: tosca.capabilities.OperatingSystem + disk.device.latency_server_cmaui_3: + type: org.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_cmaui_test_nested4Level: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + disk.write.bytes_server_cmaui_3: + type: org.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_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + disk.allocation_server_cmaui_3: + type: org.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_cmaui: + binding_server_cmaui_3: type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED + vcpus_server_cmaui_3: + type: org.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_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_6: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -881,175 +2893,367 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_template_VMInt_OAM_lb_8_test_nested4Level: + scalable_server_cmaui_3: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + forwarder_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.read.requests_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - binding_server_cmaui_test_nested4Level: - type: tosca.capabilities.network.Bindable + network.incoming.bytes_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - org.openecomp.resource.abstract.nodes.heat.nested4: - derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute - properties: - cmaui_names: - type: list - description: CMAUI1, CMAUI2 server names - required: true - status: SUPPORTED - entry_schema: - type: string - p1: - type: string - description: UID of OAM network - required: true - status: SUPPORTED - p2: - type: string - required: true - status: SUPPORTED - template_PortTuple_LB1: - type: string - required: true - status: SUPPORTED - lb_st_interface_type_oam: - type: string - required: true - status: SUPPORTED - oam_sec_group_name: - type: string - required: true - status: SUPPORTED - virtual_ip_address: - type: string - required: true - status: SUPPORTED - security_group_name: - type: list - description: CMAUI1, CMAUI2 server names - required: true - status: SUPPORTED - entry_schema: - type: string - vlan_ids: - type: string - required: true - status: SUPPORTED - cmaui_image: - type: string - description: Image for CMAUI server - required: true - status: SUPPORTED - virtual_ipv6_address: - type: string - required: true - status: SUPPORTED - cmaui_flavor: - type: string - description: Flavor for CMAUI server - required: true - status: SUPPORTED - lb_st_vlan_type_oam: - type: string - description: dummy - required: true - status: SUPPORTED - mac_address: - type: string - required: true - status: SUPPORTED - availability_zone_0: - type: string - description: availabilityzone name - required: true - status: SUPPORTED - subinterface_name_prefix: - type: string - required: true - status: SUPPORTED - subinterface_instance_index: - type: float - required: true - status: SUPPORTED - cmaui_oam_ips: - type: string - required: true - status: SUPPORTED - requirements: - - link_template_VMInt_OAM_lb_7: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + disk.write.requests_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - - link_template_VMInt_OAM_lb_8: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - UNBOUNDED + network.incoming.bytes_template_VMInt_OAM_lb_5: + type: org.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_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - UNBOUNDED + disk.device.iops_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - - link_template_Vlan_4: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + disk.device.capacity_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: - 1 - capabilities: - host_server_cmaui: + - UNBOUNDED + feature_template_VMInt_OAM_lb_8: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_6: + type: org.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_template_VMInt_OAM_lb_6: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_template_VMInt_OAM_lb_5: + type: org.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_template_VMInt_OAM_lb_5: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + endpoint_server_cmaui_3: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_server_cmaui_3: + type: org.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_cmaui_3: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_server_cmaui_3: + type: org.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_cmaui_3: + type: org.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_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_cmaui_3: + type: org.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_cmaui_3: type: tosca.capabilities.Container valid_source_types: - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem + network.outpoing.packets_template_VMInt_OAM_lb_5: + type: org.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_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + network.outgoing.packets.rate_template_VMInt_OAM_lb_8: + type: org.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_cmaui: - type: tosca.capabilities.network.Bindable + disk.ephemeral.size_server_cmaui_3: + type: org.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_server_cmaui: - type: tosca.capabilities.Scalable + network.outgoing.packets.rate_template_VMInt_OAM_lb_6: + type: org.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_template_VMInt_OAM_lb_8: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.capacity_server_cmaui_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_7: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outgoing.packets.rate_template_VMInt_OAM_lb_5: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 + - UNBOUNDED + network.outgoing.bytes_template_VMInt_OAM_lb_5: + type: org.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_template_VMInt_OAM_lb_6: + type: org.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_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_subint_oam_vmi_4_test_nested4Level: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_template_VMInt_OAM_lb_6: + type: org.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_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: + type: org.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_template_VMInt_OAM_lb_8: + type: org.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_template_VMInt_OAM_lb_5: + type: org.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_template_VMInt_OAM_lb_6: + type: org.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_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: + type: org.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_template_VMInt_OAM_lb_5: + type: org.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_template_VMInt_OAM_lb_6: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.iops_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: + type: org.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_template_VMInt_OAM_lb_5: + type: org.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_template_VMInt_OAM_lb_6: + type: org.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_cmaui_3: + type: org.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_template_VMInt_OAM_lb_8: + type: org.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_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_server_cmaui_3: + type: org.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_cmaui_3: + type: org.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/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index cb4c190ae4..ff3411cb33 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: @@ -44,15 +14,39 @@ topology_template: contrail_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string jsa_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name type: string description: network name of jsa log network node_templates: @@ -77,23 +71,11 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo @@ -101,7 +83,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3_test_nested3Level_test_nested2Level: + - link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo @@ -113,10 +95,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2_test_nested2Level: - capability: tosca.capabilities.network.Linkable - node: test_contrailV2_net - relationship: tosca.relationships.network.LinksTo test_resourceGroup: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -138,15 +116,15 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_VMInt_OAM_lb_8_test_nested4Level: + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_4_test_nested4Level: + - link_template_VMInt_OAM_lb_6: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_6: + - link_template_VMInt_OAM_lb_8: capability: tosca.capabilities.network.Linkable node: test_contrailV2_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index ec585edd53..b4e80d35af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested1 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: @@ -135,7 +105,7 @@ topology_template: virtual_network_refs: - get_input: p1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -153,7 +123,7 @@ topology_template: - get_input: p2 - get_input: p1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -176,50 +146,6 @@ topology_template: get_input: - cmaui_names - 0 - template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: p1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo test_nested2Level: type: org.openecomp.resource.abstract.nodes.heat.nested2 directives: @@ -241,141 +167,698 @@ topology_template: - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - server_cmaui - - template_Vlan_1 - test_nested2Level substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - os_server_cmaui_test_nested2Level: + disk.device.write.requests.rate_server_cmaui: + - server_cmaui + - disk.device.write.requests.rate + disk.device.allocation_server_cmaui: + - server_cmaui + - disk.device.allocation + memory.resident_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.resident_server_cmaui_3_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level + network.outpoing.packets_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_3 + host_server_cmaui: + - server_cmaui + - host + disk.device.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_cmaui_3_test_nested3Level + scalable_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_3_test_nested3Level + binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_5_test_nested3Level + network.incoming.bytes_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.bytes + network.incoming.bytes_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.bytes + endpoint_server_cmaui_2_test_nested2Level: + - test_nested2Level + - endpoint_server_cmaui_2 + disk.latency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_3_test_nested3Level + feature_server_cmaui_2_test_nested2Level: + - test_nested2Level + - feature_server_cmaui_2 + disk.capacity_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.capacity_server_cmaui_2 + instance_server_cmaui: + - server_cmaui + - instance + binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui + - binding_template_VMInt_OAM_lb_6_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level + binding_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_3 + disk.device.write.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_4 + disk.device.read.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_cmaui_2 + disk.device.write.requests.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_cmaui_2 os_server_cmaui: - server_cmaui - os - os_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + disk.read.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_cmaui_2 + disk.device.allocation_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_cmaui_2 + network.incoming.packets_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.packets + network.incoming.packets_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.packets + network.outgoing.bytes_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.bytes + network.outgoing.bytes_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.bytes + binding_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_4 + instance_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - instance_server_cmaui_3_test_nested3Level + feature_server_cmaui: + - server_cmaui + - feature + feature_test_nested2Level: + - test_nested2Level + - feature + disk.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_cmaui_3_test_nested3Level + memory.usage_server_cmaui: + - server_cmaui + - memory.usage + cpu_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui_test_nested4Level_test_nested3Level - endpoint_server_cmaui_test_nested2Level: + - cpu_server_cmaui_3_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_4 + disk.ephemeral.size_server_cmaui: + - server_cmaui + - disk.ephemeral.size + forwarder_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_4 + network.incoming.packets_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.iops_server_cmaui: + - server_cmaui + - disk.device.iops + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui - scalable_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui_test_nested4Level_test_nested3Level - endpoint_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.device.read.requests.rate_server_cmaui_3_test_nested3Level + cpu_server_cmaui: + - server_cmaui + - cpu + cpu_server_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu_server_cmaui_2 + network.incoming.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_3 + feature_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_4 + disk.ephemeral.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_cmaui_3_test_nested3Level + disk.device.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.read.bytes.rate + disk.root.size_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_3 + os_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - os_server_cmaui_3_test_nested3Level + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level + forwarder_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - forwarder + network.outgoing.bytes.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.bytes.rate + disk.device.latency_server_cmaui: + - server_cmaui + - disk.device.latency + disk.read.requests_server_cmaui: + - server_cmaui + - disk.read.requests + disk.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.bytes.rate + binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_8_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_4 + disk.usage_server_cmaui: + - server_cmaui + - disk.usage + forwarder_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - forwarder + disk.device.usage_server_cmaui: + - server_cmaui + - disk.device.usage + disk.capacity_server_cmaui: + - server_cmaui + - disk.capacity + disk.write.requests.rate_server_cmaui: + - server_cmaui + - disk.write.requests.rate + disk.device.write.bytes_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_cmaui_2 + network.incoming.packets.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.packets.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.packets.rate + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level + disk.device.read.requests_server_cmaui: + - server_cmaui + - disk.device.read.requests + feature_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - feature + feature_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - feature + binding_server_cmaui: + - server_cmaui + - binding + disk.usage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.usage_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_cmaui_2 + disk.device.read.requests.rate_server_cmaui: + - server_cmaui + - disk.device.read.requests.rate + disk.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_cmaui_3_test_nested3Level + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level + disk.write.bytes_server_cmaui: + - server_cmaui + - disk.write.bytes + disk.device.write.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_3 + disk.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_cmaui_3_test_nested3Level + os_server_cmaui_2_test_nested2Level: + - test_nested2Level + - os_server_cmaui_2 + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_4 + disk.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_cmaui_3_test_nested3Level + disk.device.iops_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_cmaui_2 + disk.read.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_cmaui_2 + memory_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory_server_cmaui_3_test_nested3Level + vcpus_server_cmaui: + - server_cmaui + - vcpus + disk.device.write.bytes_server_cmaui: + - server_cmaui + - disk.device.write.bytes + disk.allocation_server_cmaui: + - server_cmaui + - disk.allocation + disk.device.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level + disk.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_cmaui_3_test_nested3Level + forwarder_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_6_test_nested3Level + disk.device.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_cmaui_3_test_nested3Level + cpu.delta_server_cmaui: + - server_cmaui + - cpu.delta + cpu_util_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested4Level_test_nested3Level - host_server_cmaui_test_nested3Level_test_nested2Level: + - cpu_util_server_cmaui_2 + memory.usage_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui_test_nested3Level - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - memory.usage_server_cmaui_2 + feature_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level + - feature_server_cmaui_3_test_nested3Level scalable_server_cmaui: - server_cmaui - scalable - scalable_server_cmaui_test_nested3Level_test_nested2Level: + disk.read.bytes.rate_server_cmaui: + - server_cmaui + - disk.read.bytes.rate + disk.device.read.requests_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - scalable_server_cmaui_test_nested3Level - host_server_cmaui: + - disk.device.read.requests_server_cmaui_3_test_nested3Level + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_cmaui_3_test_nested3Level + cpu_util_server_cmaui: - server_cmaui - - host - binding_template_VMInt_OAM_lb_4_test_nested2Level: + - cpu_util + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_4 - binding_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level + disk.read.requests_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_5_test_nested3Level - host_server_cmaui_test_nested2Level: + - disk.read.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level + disk.write.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_cmaui_2 + disk.device.write.requests_server_cmaui: + - server_cmaui + - disk.device.write.requests + disk.latency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.latency_server_cmaui_2 + vcpus_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - vcpus_server_cmaui_3_test_nested3Level + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level + forwarder_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_8_test_nested3Level + disk.device.read.bytes_server_cmaui: + - server_cmaui + - disk.device.read.bytes + network.outgoing.packets.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outgoing.packets.rate + disk.device.write.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_cmaui_2 + network.outgoing.packets.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outgoing.packets.rate + disk.root.size_server_cmaui: + - server_cmaui + - disk.root.size + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level + disk.device.read.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_cmaui_2 + memory.resident_server_cmaui_2_test_nested2Level: + - test_nested2Level + - memory.resident_server_cmaui_2 + disk.device.iops_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_cmaui_3_test_nested3Level + disk.allocation_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.allocation_server_cmaui_2 + disk.device.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.device.write.bytes.rate + network.outpoing.packets_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.outpoing.packets + network.outpoing.packets_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.outpoing.packets + disk.device.write.requests_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_cmaui_3_test_nested3Level + disk.write.requests_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_cmaui_2 + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_3 + disk.device.read.bytes.rate_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_cmaui_2 + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level + feature_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_test_nested4Level_test_nested3Level + network.incoming.bytes.rate_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - network.incoming.bytes.rate + disk.device.usage_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_cmaui_2 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level + disk.iops_server_cmaui: + - server_cmaui + - disk.iops + disk.read.bytes_server_cmaui: + - server_cmaui + - disk.read.bytes + endpoint_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - endpoint_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_5_test_nested3Level + binding_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_server_cmaui_3_test_nested3Level + network.incoming.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_3 + network.outgoing.bytes_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_3 + disk.iops_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.iops_server_cmaui_2 + disk.write.bytes.rate_server_cmaui: + - server_cmaui + - disk.write.bytes.rate + network.incoming.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_template_VMInt_OAM_lb_4 + network.outgoing.bytes_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_template_VMInt_OAM_lb_4 + instance_server_cmaui_2_test_nested2Level: + - test_nested2Level + - instance_server_cmaui_2 + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + disk.device.capacity_server_cmaui: + - server_cmaui + - disk.device.capacity + forwarder_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - forwarder_template_VMInt_OAM_lb_5_test_nested3Level + disk.read.bytes_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_cmaui_3_test_nested3Level + cpu.delta_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_3_test_nested3Level + feature_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_6_test_nested3Level + memory_server_cmaui_2_test_nested2Level: - test_nested2Level - - host_server_cmaui - endpoint_server_cmaui_test_nested3Level_test_nested2Level: + - memory_server_cmaui_2 + disk.usage_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - endpoint_server_cmaui_test_nested3Level - binding_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - disk.usage_server_cmaui_3_test_nested3Level + memory_server_cmaui: + - server_cmaui + - memory + disk.root.size_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.root.size_server_cmaui_2 + cpu_util_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - cpu_util_server_cmaui_3_test_nested3Level + disk.device.latency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_cmaui_2 + disk.allocation_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.allocation_server_cmaui_3_test_nested3Level + disk.ephemeral.size_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_cmaui_2 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_3 + disk.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.capacity_server_cmaui_3_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_4_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_4 + binding_server_cmaui_2_test_nested2Level: + - test_nested2Level + - binding_server_cmaui_2 + cpu.delta_server_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu.delta_server_cmaui_2 + disk.device.capacity_server_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_cmaui_2 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level + memory.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - memory.usage_server_cmaui_3_test_nested3Level + scalable_server_cmaui_2_test_nested2Level: + - test_nested2Level + - scalable_server_cmaui_2 + host_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui_test_nested4Level_test_nested3Level - binding_server_cmaui_test_nested3Level_test_nested2Level: + - host_server_cmaui_3_test_nested3Level + disk.iops_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui_test_nested3Level + - disk.iops_server_cmaui_3_test_nested3Level + memory.resident_server_cmaui: + - server_cmaui + - memory.resident + vcpus_server_cmaui_2_test_nested2Level: + - test_nested2Level + - vcpus_server_cmaui_2 + network.outgoing.packets.rate_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_3 + disk.latency_server_cmaui: + - server_cmaui + - disk.latency + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level binding_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - binding binding_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - binding - os_server_cmaui_test_nested3Level_test_nested2Level: + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level_test_nested2Level: - test_nested2Level - - os_server_cmaui_test_nested3Level - binding_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: + - disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level + disk.write.requests_server_cmaui: + - server_cmaui + - disk.write.requests + disk.write.requests.rate_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_6_test_nested3Level - binding_template_VMInt_OAM_lb_3_test_nested2Level: + - disk.write.requests.rate_server_cmaui_2 + disk.write.bytes_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_3 + - disk.write.bytes_server_cmaui_2 + feature_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_test_nested3Level + disk.device.usage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_cmaui_3_test_nested3Level + disk.device.capacity_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_cmaui_3_test_nested3Level + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level + feature_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_template_VMInt_OAM_lb_8_test_nested3Level endpoint_server_cmaui: - server_cmaui - endpoint - scalable_server_cmaui_test_nested2Level: + network.incoming.bytes.rate_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - - scalable_server_cmaui - binding_server_cmaui: - - server_cmaui - - binding - binding_server_cmaui_test_nested2Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_4 + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - binding_server_cmaui - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + - network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level + host_server_cmaui_2_test_nested2Level: - test_nested2Level - - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level + - host_server_cmaui_2 requirements: - link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + dependency_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_5_test_nested3Level - link_template_Vlan_2_test_nested2Level: + - dependency_template_VMInt_OAM_lb_4 + dependency_server_cmaui: + - server_cmaui + - dependency + local_storage_server_cmaui_2_test_nested2Level: - test_nested2Level - - link_template_Vlan_2 + - local_storage_server_cmaui_2 link_template_VMInt_OAM_lb_4_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_4 - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level_test_nested2Level: + dependency_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level - link_template_Vlan_3_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_3_test_nested3Level + - dependency link_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_6_test_nested3Level link_template_VMInt_OAM_lb_1: - template_VMInt_OAM_lb_1 - link - local_storage_server_cmaui: - - server_cmaui - - local_storage + dependency_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_5_test_nested3Level link_template_VMInt_OAM_lb_3_test_nested2Level: - test_nested2Level - link_template_VMInt_OAM_lb_3 - local_storage_server_cmaui_test_nested2Level: - - test_nested2Level - - local_storage_server_cmaui link_template_VMInt_OAM_lb_2: - template_VMInt_OAM_lb_2 - link - link_template_Vlan_1: - - template_Vlan_1 - - link - link_template_Vlan_4_test_nested4Level_test_nested3Level_test_nested2Level: + dependency_server_cmaui_2_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_2 + local_storage_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - local_storage_server_cmaui_3_test_nested3Level + dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_4_test_nested4Level_test_nested3Level - local_storage_server_cmaui_test_nested3Level_test_nested2Level: + - dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + binding_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - binding_template_VMInt_OAM_lb_8_test_nested3Level + link_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - link_template_VMInt_OAM_lb_8_test_nested3Level + link_template_VMInt_OAM_lb_5_test_nested3Level_test_nested2Level: + - test_nested2Level + - link_template_VMInt_OAM_lb_5_test_nested3Level + dependency_template_VMInt_OAM_lb_8_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_8_test_nested3Level + dependency_server_cmaui_3_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_server_cmaui_3_test_nested3Level + subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level + dependency_template_VMInt_OAM_lb_1: + - template_VMInt_OAM_lb_1 + - dependency + dependency_template_VMInt_OAM_lb_2: + - template_VMInt_OAM_lb_2 + - dependency + dependency_template_VMInt_OAM_lb_3_test_nested2Level: + - test_nested2Level + - dependency_template_VMInt_OAM_lb_3 + local_storage_server_cmaui: + - server_cmaui + - local_storage + dependency_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - - local_storage_server_cmaui_test_nested3Level - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level_test_nested2Level: + - dependency_test_nested4Level_test_nested3Level + dependency_template_VMInt_OAM_lb_6_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level - local_storage_server_cmaui_test_nested4Level_test_nested3Level_test_nested2Level: + - dependency_template_VMInt_OAM_lb_6_test_nested3Level + dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - local_storage_server_cmaui_test_nested4Level_test_nested3Level
\ No newline at end of file + - dependency_test_nested3Level
\ 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/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index e0ac24d1a9..3c6bb3a13f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: @@ -127,6 +97,20 @@ topology_template: immutable: false type: string node_templates: + server_cmaui_2: + type: org.openecomp.resource.vfc.nodes.heat.cmaui + properties: + flavor: + get_input: cmaui_flavor + availability_zone: + get_input: availability_zone_0 + image: + get_input: cmaui_image + contrail_service_instance_ind: true + name: + get_input: + - cmaui_names + - 0 test_nested3Level: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -153,14 +137,14 @@ topology_template: virtual_network_refs: - get_input: p1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_4: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface @@ -171,73 +155,14 @@ topology_template: - get_input: p2 - get_input: p1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_4 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: p2 - - get_input: p1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_4 + node: server_cmaui_2 relationship: tosca.relationships.network.BindsTo groups: nested2_group: @@ -246,111 +171,488 @@ topology_template: heat_file: ../Artifacts/nested2.yml description: nested2 members: + - server_cmaui_2 - test_nested3Level - template_VMInt_OAM_lb_3 - template_VMInt_OAM_lb_4 - - server_cmaui - - template_Vlan_2 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - os_server_cmaui: - - server_cmaui - - os - os_server_cmaui_test_nested4Level_test_nested3Level: + memory.usage_server_cmaui_3_test_nested3Level: - test_nested3Level - - os_server_cmaui_test_nested4Level - scalable_server_cmaui_test_nested4Level_test_nested3Level: + - memory.usage_server_cmaui_3 + cpu_util_server_cmaui_3_test_nested3Level: - test_nested3Level - - scalable_server_cmaui_test_nested4Level - host_server_cmaui_test_nested3Level: + - cpu_util_server_cmaui_3 + disk.device.usage_server_cmaui_2: + - server_cmaui_2 + - disk.device.usage + network.incoming.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - host_server_cmaui - endpoint_server_cmaui_test_nested3Level: + - network.incoming.bytes.rate_template_VMInt_OAM_lb_6 + disk.device.latency_server_cmaui_2: + - server_cmaui_2 + - disk.device.latency + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - endpoint_server_cmaui - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_6_test_nested3Level: + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_8 + disk.root.size_server_cmaui_2: + - server_cmaui_2 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests.rate + network.incoming.packets_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_6 - binding_server_cmaui_test_nested3Level: + - network.incoming.packets_template_VMInt_OAM_lb_8 + disk.read.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - binding_server_cmaui - host_server_cmaui: - - server_cmaui - - host - binding_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + - disk.read.requests_server_cmaui_3 + disk.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.latency_server_cmaui_3 + binding_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - binding + disk.write.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.bytes.rate_server_cmaui_3 + binding_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - binding + network.incoming.bytes_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.bytes + disk.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.read.requests + network.incoming.bytes_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.bytes + feature_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_test_nested4Level + disk.device.iops_server_cmaui_2: + - server_cmaui_2 + - disk.device.iops + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_6 + disk.device.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.device.capacity + disk.device.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes.rate + disk.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes + disk.device.read.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.bytes + disk.write.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_5 + memory_server_cmaui_2: + - server_cmaui_2 + - memory + cpu_server_cmaui_2: + - server_cmaui_2 + - cpu + host_server_cmaui_3_test_nested3Level: + - test_nested3Level + - host_server_cmaui_3 + disk.allocation_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.allocation_server_cmaui_3 + network.outpoing.packets_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outpoing.packets + network.incoming.packets_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_7_test_nested4Level - scalable_server_cmaui_test_nested3Level: + - network.incoming.packets_template_VMInt_OAM_lb_5 + network.outpoing.packets_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outpoing.packets + disk.ephemeral.size_server_cmaui_2: + - server_cmaui_2 + - disk.ephemeral.size + disk.write.requests_server_cmaui_3_test_nested3Level: - test_nested3Level - - scalable_server_cmaui + - disk.write.requests_server_cmaui_3 + disk.capacity_server_cmaui_2: + - server_cmaui_2 + - disk.capacity + network.outgoing.bytes_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.bytes + network.incoming.packets_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.packets + network.outgoing.bytes_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outgoing.bytes + network.incoming.packets_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.packets binding_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - binding_template_VMInt_OAM_lb_5 - binding_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + network.outgoing.bytes_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - binding_template_VMInt_OAM_lb_8_test_nested4Level - endpoint_server_cmaui: - - server_cmaui - - endpoint - os_server_cmaui_test_nested3Level: + - network.outgoing.bytes_template_VMInt_OAM_lb_8 + disk.read.bytes.rate_server_cmaui_3_test_nested3Level: - test_nested3Level - - os_server_cmaui - endpoint_server_cmaui_test_nested4Level_test_nested3Level: + - disk.read.bytes.rate_server_cmaui_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - endpoint_server_cmaui_test_nested4Level - binding_server_cmaui: - - server_cmaui - - binding - binding_template_VMInt_OAM_lb_4: + - network.incoming.packets.rate_template_VMInt_OAM_lb_8 + forwarder_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_8 + network.outgoing.bytes.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_4: - template_VMInt_OAM_lb_4 + - network.outgoing.bytes.rate + disk.iops_server_cmaui_2: + - server_cmaui_2 + - disk.iops + network.incoming.bytes.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.bytes.rate + disk.device.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.requests + network.outgoing.packets.rate_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_8 + memory_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory_server_cmaui_3 + feature_server_cmaui_3_test_nested3Level: + - test_nested3Level + - feature_server_cmaui_3 + network.incoming.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_6 + disk.device.write.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes.rate_server_cmaui_3 + disk.root.size_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.root.size_server_cmaui_3 + disk.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.usage_server_cmaui_3 + network.outpoing.packets_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_5 + disk.device.write.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.requests_server_cmaui_3 + disk.device.read.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests.rate_server_cmaui_3 + disk.device.latency_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.latency_server_cmaui_3 + cpu_util_server_cmaui_2: + - server_cmaui_2 + - cpu_util + disk.device.write.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.requests.rate_server_cmaui_3 + disk.device.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes.rate + disk.write.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes.rate + disk.device.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.device.write.bytes + network.outgoing.packets.rate_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_6 + feature_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - feature_template_subint_oam_vmi_4_test_nested4Level + disk.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.iops_server_cmaui_3 + feature_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_5 + cpu_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu_server_cmaui_3 + disk.write.bytes_server_cmaui_2: + - server_cmaui_2 + - disk.write.bytes + feature_server_cmaui_2: + - server_cmaui_2 + - feature + disk.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.allocation + network.incoming.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_6 + binding_server_cmaui_2: + - server_cmaui_2 - binding - host_server_cmaui_test_nested4Level_test_nested3Level: + vcpus_server_cmaui_2: + - server_cmaui_2 + - vcpus + binding_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - host_server_cmaui_test_nested4Level - binding_template_VMInt_OAM_lb_3: + - binding_template_VMInt_OAM_lb_8 + instance_server_cmaui_3_test_nested3Level: + - test_nested3Level + - instance_server_cmaui_3 + scalable_server_cmaui_2: + - server_cmaui_2 + - scalable + network.outgoing.bytes_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_template_VMInt_OAM_lb_5 + network.incoming.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.incoming.packets.rate_template_VMInt_OAM_lb_5 + forwarder_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - forwarder + forwarder_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - - binding - binding_server_cmaui_test_nested4Level_test_nested3Level: + - forwarder + disk.device.read.bytes.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes.rate_server_cmaui_3 + disk.write.requests_server_cmaui_2: + - server_cmaui_2 + - disk.write.requests + network.incoming.packets.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.incoming.packets.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.incoming.packets.rate + disk.usage_server_cmaui_2: + - server_cmaui_2 + - disk.usage + disk.device.usage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.usage_server_cmaui_3 + disk.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.bytes_server_cmaui_3 + network.outgoing.packets.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.packets.rate_template_VMInt_OAM_lb_5 + disk.write.requests.rate_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.write.requests.rate_server_cmaui_3 + endpoint_server_cmaui_2: + - server_cmaui_2 + - endpoint + network.outgoing.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes_template_VMInt_OAM_lb_6 + feature_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - feature + binding_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - binding_template_VMInt_OAM_lb_6 + forwarder_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - forwarder_template_VMInt_OAM_lb_5 + feature_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - feature + os_server_cmaui_2: + - server_cmaui_2 + - os + network.incoming.bytes_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_6 + network.outpoing.packets_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_8 + disk.device.allocation_server_cmaui_2: + - server_cmaui_2 + - disk.device.allocation + disk.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.read.bytes_server_cmaui_3 + disk.device.allocation_server_cmaui_3_test_nested3Level: - test_nested3Level - - binding_server_cmaui_test_nested4Level + - disk.device.allocation_server_cmaui_3 + host_server_cmaui_2: + - server_cmaui_2 + - host + os_server_cmaui_3_test_nested3Level: + - test_nested3Level + - os_server_cmaui_3 + binding_server_cmaui_3_test_nested3Level: + - test_nested3Level + - binding_server_cmaui_3 + network.incoming.bytes.rate_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.incoming.bytes.rate_template_VMInt_OAM_lb_8 + feature_test_nested3Level: + - test_nested3Level + - feature + feature_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_8 + network.outgoing.packets.rate_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - network.outgoing.packets.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5_test_nested3Level: + - test_nested3Level + - network.outgoing.bytes.rate_template_VMInt_OAM_lb_5 + cpu.delta_server_cmaui_3_test_nested3Level: + - test_nested3Level + - cpu.delta_server_cmaui_3 + network.outgoing.packets.rate_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - network.outgoing.packets.rate + disk.device.capacity_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.capacity_server_cmaui_3 + scalable_server_cmaui_3_test_nested3Level: + - test_nested3Level + - scalable_server_cmaui_3 + instance_server_cmaui_2: + - server_cmaui_2 + - instance + disk.device.iops_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.iops_server_cmaui_3 + network.incoming.bytes_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - network.incoming.bytes_template_VMInt_OAM_lb_8 + network.outpoing.packets_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.outpoing.packets_template_VMInt_OAM_lb_6 + endpoint_server_cmaui_3_test_nested3Level: + - test_nested3Level + - endpoint_server_cmaui_3 + vcpus_server_cmaui_3_test_nested3Level: + - test_nested3Level + - vcpus_server_cmaui_3 + disk.device.write.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.write.bytes_server_cmaui_3 + disk.device.read.requests_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests + disk.read.bytes.rate_server_cmaui_2: + - server_cmaui_2 + - disk.read.bytes.rate + network.incoming.packets_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - network.incoming.packets_template_VMInt_OAM_lb_6 + disk.capacity_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.capacity_server_cmaui_3 + cpu.delta_server_cmaui_2: + - server_cmaui_2 + - cpu.delta + disk.device.read.requests.rate_server_cmaui_2: + - server_cmaui_2 + - disk.device.read.requests.rate + memory.resident_server_cmaui_2: + - server_cmaui_2 + - memory.resident + disk.device.read.requests_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.requests_server_cmaui_3 + disk.latency_server_cmaui_2: + - server_cmaui_2 + - disk.latency + feature_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - feature_template_VMInt_OAM_lb_6 + disk.ephemeral.size_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.ephemeral.size_server_cmaui_3 + disk.device.read.bytes_server_cmaui_3_test_nested3Level: + - test_nested3Level + - disk.device.read.bytes_server_cmaui_3 + memory.resident_server_cmaui_3_test_nested3Level: + - test_nested3Level + - memory.resident_server_cmaui_3 + memory.usage_server_cmaui_2: + - server_cmaui_2 + - memory.usage requirements: - link_template_VMInt_OAM_lb_7_test_nested4Level_test_nested3Level: + dependency_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_7_test_nested4Level - local_storage_server_cmaui: - - server_cmaui - - local_storage + - dependency_template_VMInt_OAM_lb_5 + local_storage_server_cmaui_3_test_nested3Level: + - test_nested3Level + - local_storage_server_cmaui_3 link_template_VMInt_OAM_lb_5_test_nested3Level: - test_nested3Level - link_template_VMInt_OAM_lb_5 + dependency_template_VMInt_OAM_lb_3: + - template_VMInt_OAM_lb_3 + - dependency + subinterface_link_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - subinterface_link_template_subint_oam_vmi_4_test_nested4Level + dependency_template_VMInt_OAM_lb_4: + - template_VMInt_OAM_lb_4 + - dependency + local_storage_server_cmaui_2: + - server_cmaui_2 + - local_storage + dependency_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_test_nested4Level + dependency_template_subint_oam_vmi_4_test_nested4Level_test_nested3Level: + - test_nested3Level + - dependency_template_subint_oam_vmi_4_test_nested4Level link_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - link - local_storage_server_cmaui_test_nested4Level_test_nested3Level: + dependency_server_cmaui_3_test_nested3Level: - test_nested3Level - - local_storage_server_cmaui_test_nested4Level - link_template_Vlan_2: - - template_Vlan_2 - - link + - dependency_server_cmaui_3 + dependency_template_VMInt_OAM_lb_6_test_nested3Level: + - test_nested3Level + - dependency_template_VMInt_OAM_lb_6 + binding_template_VMInt_OAM_lb_8_test_nested3Level: + - test_nested3Level + - binding_template_VMInt_OAM_lb_8 link_template_VMInt_OAM_lb_4: - template_VMInt_OAM_lb_4 - link - link_template_Vlan_3_test_nested3Level: + link_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - link_template_Vlan_3 - link_template_VMInt_OAM_lb_8_test_nested4Level_test_nested3Level: + - link_template_VMInt_OAM_lb_8 + dependency_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_8_test_nested4Level - link_template_Vlan_4_test_nested4Level_test_nested3Level: + - dependency + dependency_template_VMInt_OAM_lb_8_test_nested3Level: - test_nested3Level - - link_template_Vlan_4_test_nested4Level + - dependency_template_VMInt_OAM_lb_8 + dependency_server_cmaui_2: + - server_cmaui_2 + - dependency link_template_VMInt_OAM_lb_6_test_nested3Level: - test_nested3Level - - link_template_VMInt_OAM_lb_6 - local_storage_server_cmaui_test_nested3Level: - - test_nested3Level - - local_storage_server_cmaui
\ No newline at end of file + - link_template_VMInt_OAM_lb_6
\ 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/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 026f5c6933..3fbfb47ed5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested3 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: @@ -138,17 +108,17 @@ topology_template: virtual_network_refs: - get_input: p2 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo test_nested4Level: - type: org.openecomp.resource.abstract.nodes.heat.nested4 + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested4 directives: - substitutable properties: @@ -158,6 +128,12 @@ topology_template: substitute_service_template: nested4ServiceTemplate.yaml p2: get_input: p2 + p3: template_VMInt_OAM_lb_8 + requirements: + - binding_template_subint_oam_vmi_4: + capability: tosca.capabilities.network.Bindable + node: template_VMInt_OAM_lb_8 + relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_6: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -167,16 +143,16 @@ topology_template: - get_input: p1 - get_input: p2 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 requirements: - binding: capability: tosca.capabilities.network.Bindable - node: server_cmaui + node: server_cmaui_3 relationship: tosca.relationships.network.BindsTo - server_cmaui: + server_cmaui_3: type: org.openecomp.resource.vfc.nodes.heat.cmaui properties: flavor: @@ -190,50 +166,18 @@ topology_template: get_input: - cmaui_names - 0 - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_VMInt_OAM_lb_8: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_5 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index + security_group_refs: + - get_input: oam_sec_group_name virtual_network_refs: - - get_input: p2 + - get_input: p1 virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_5 - relationship: tosca.relationships.network.BindsTo + service_interface_type: + get_input: lb_st_interface_type_oam + port_tuple_refs: + - get_input: template_PortTuple_LB1 groups: nested3_group: type: org.openecomp.groups.heat.HeatStack @@ -244,75 +188,273 @@ topology_template: - template_VMInt_OAM_lb_5 - test_nested4Level - template_VMInt_OAM_lb_6 - - server_cmaui - - template_Vlan_3 + - server_cmaui_3 + - template_VMInt_OAM_lb_8 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested3 capabilities: - scalable_server_cmaui_test_nested4Level: - - test_nested4Level - - scalable_server_cmaui - os_server_cmaui: - - server_cmaui - - os - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_7_test_nested4Level: - - test_nested4Level - - binding_template_VMInt_OAM_lb_7 - endpoint_server_cmaui_test_nested4Level: - - test_nested4Level - - endpoint_server_cmaui - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui_test_nested4Level: - - test_nested4Level - - os_server_cmaui - host_server_cmaui_test_nested4Level: - - test_nested4Level - - host_server_cmaui - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui + disk.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes.rate + forwarder_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - forwarder + disk.device.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes + forwarder_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - forwarder + feature_server_cmaui_3: + - server_cmaui_3 + - feature + disk.device.usage_server_cmaui_3: + - server_cmaui_3 + - disk.device.usage + disk.device.latency_server_cmaui_3: + - server_cmaui_3 + - disk.device.latency + disk.write.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.write.bytes + disk.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.allocation + binding_server_cmaui_3: + - server_cmaui_3 - binding + vcpus_server_cmaui_3: + - server_cmaui_3 + - vcpus + disk.root.size_server_cmaui_3: + - server_cmaui_3 + - disk.root.size + disk.device.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests.rate binding_template_VMInt_OAM_lb_6: - template_VMInt_OAM_lb_6 - binding binding_template_VMInt_OAM_lb_5: - template_VMInt_OAM_lb_5 - binding - binding_template_VMInt_OAM_lb_8_test_nested4Level: + scalable_server_cmaui_3: + - server_cmaui_3 + - scalable + forwarder_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - forwarder + disk.read.requests_server_cmaui_3: + - server_cmaui_3 + - disk.read.requests + binding_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - binding + network.incoming.bytes_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.bytes + disk.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests + network.incoming.bytes_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.bytes + network.incoming.bytes_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.bytes + disk.usage_server_cmaui_3: + - server_cmaui_3 + - disk.usage + disk.device.iops_server_cmaui_3: + - server_cmaui_3 + - disk.device.iops + disk.device.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.device.capacity + network.incoming.packets.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - feature + disk.device.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes.rate + network.incoming.packets.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - feature + network.incoming.packets.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.packets.rate + feature_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - feature + endpoint_server_cmaui_3: + - server_cmaui_3 + - endpoint + disk.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes + os_server_cmaui_3: + - server_cmaui_3 + - os + disk.write.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.write.requests.rate + disk.device.read.bytes_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.bytes + memory_server_cmaui_3: + - server_cmaui_3 + - memory + disk.device.allocation_server_cmaui_3: + - server_cmaui_3 + - disk.device.allocation + cpu_server_cmaui_3: + - server_cmaui_3 + - cpu + host_server_cmaui_3: + - server_cmaui_3 + - host + network.outpoing.packets_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outpoing.packets + network.outgoing.packets.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.packets.rate + disk.ephemeral.size_server_cmaui_3: + - server_cmaui_3 + - disk.ephemeral.size + network.outgoing.packets.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.packets.rate + disk.capacity_server_cmaui_3: + - server_cmaui_3 + - disk.capacity + network.outgoing.packets.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.packets.rate + network.outgoing.bytes_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.bytes + network.outgoing.bytes_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.bytes + feature_test_nested4Level: - test_nested4Level - - binding_template_VMInt_OAM_lb_8 - binding_server_cmaui_test_nested4Level: + - feature + feature_template_subint_oam_vmi_4_test_nested4Level: - test_nested4Level - - binding_server_cmaui + - feature_template_subint_oam_vmi_4 + network.outpoing.packets_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outpoing.packets + instance_server_cmaui_3: + - server_cmaui_3 + - instance + network.outpoing.packets_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outpoing.packets + network.outgoing.bytes_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.bytes + network.outgoing.bytes.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.outgoing.bytes.rate + network.outgoing.bytes.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.outgoing.bytes.rate + disk.read.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.read.bytes.rate + disk.device.write.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.requests + network.outgoing.bytes.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.outgoing.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.bytes.rate + network.incoming.bytes.rate_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.bytes.rate + disk.iops_server_cmaui_3: + - server_cmaui_3 + - disk.iops + disk.device.read.requests_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests + network.incoming.bytes.rate_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.bytes.rate + network.incoming.packets_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - network.incoming.packets + network.incoming.packets_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - network.incoming.packets + disk.device.read.requests.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.read.requests.rate + network.incoming.packets_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - network.incoming.packets + cpu.delta_server_cmaui_3: + - server_cmaui_3 + - cpu.delta + memory.resident_server_cmaui_3: + - server_cmaui_3 + - memory.resident + disk.latency_server_cmaui_3: + - server_cmaui_3 + - disk.latency + memory.usage_server_cmaui_3: + - server_cmaui_3 + - memory.usage + cpu_util_server_cmaui_3: + - server_cmaui_3 + - cpu_util + disk.device.write.bytes.rate_server_cmaui_3: + - server_cmaui_3 + - disk.device.write.bytes.rate requirements: - link_template_VMInt_OAM_lb_8_test_nested4Level: + dependency_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_8 - local_storage_server_cmaui: - - server_cmaui - - local_storage + - dependency + dependency_template_subint_oam_vmi_4_test_nested4Level: + - test_nested4Level + - dependency_template_subint_oam_vmi_4 + dependency_template_VMInt_OAM_lb_5: + - template_VMInt_OAM_lb_5 + - dependency + dependency_template_VMInt_OAM_lb_6: + - template_VMInt_OAM_lb_6 + - dependency link_template_VMInt_OAM_lb_5: - template_VMInt_OAM_lb_5 - link - link_template_Vlan_3: - - template_Vlan_3 - - link + dependency_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - dependency link_template_VMInt_OAM_lb_6: - template_VMInt_OAM_lb_6 - link - local_storage_server_cmaui_test_nested4Level: - - test_nested4Level - - local_storage_server_cmaui - link_template_Vlan_4_test_nested4Level: - - test_nested4Level - - link_template_Vlan_4 - link_template_VMInt_OAM_lb_7_test_nested4Level: + link_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - link + dependency_server_cmaui_3: + - server_cmaui_3 + - dependency + local_storage_server_cmaui_3: + - server_cmaui_3 + - local_storage + binding_template_VMInt_OAM_lb_8: + - template_VMInt_OAM_lb_8 + - binding + subinterface_link_template_subint_oam_vmi_4_test_nested4Level: - test_nested4Level - - link_template_VMInt_OAM_lb_7
\ No newline at end of file + - subinterface_link_template_subint_oam_vmi_4
\ 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/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index ba3c164e3c..a26eaede77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested4 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -57,6 +24,10 @@ topology_template: hidden: false immutable: false type: string + p3: + hidden: false + immutable: false + type: string template_PortTuple_LB1: hidden: false immutable: false @@ -126,59 +97,11 @@ topology_template: immutable: false type: string node_templates: - template_VMInt_OAM_lb_7: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p2 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_8: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - template_Vlan_4: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_subint_oam_vmi_4: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_8 + - get_input: p3 name: str_replace: template: $NAME$VLAN @@ -213,11 +136,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_8 - relationship: tosca.relationships.network.BindsTo groups: nested4_group: type: org.openecomp.groups.heat.HeatStack @@ -225,44 +143,20 @@ topology_template: heat_file: ../Artifacts/nested4.yml description: nested4 members: - - template_VMInt_OAM_lb_7 - - template_VMInt_OAM_lb_8 - - server_cmaui - - template_Vlan_4 + - template_subint_oam_vmi_4 substitution_mappings: - node_type: org.openecomp.resource.abstract.nodes.heat.nested4 + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested4 capabilities: - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui: - - server_cmaui - - os - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable - binding_template_VMInt_OAM_lb_8: - - template_VMInt_OAM_lb_8 - - binding - binding_template_VMInt_OAM_lb_7: - - template_VMInt_OAM_lb_7 - - binding + feature_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - feature requirements: - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_VMInt_OAM_lb_7: - - template_VMInt_OAM_lb_7 - - link - link_template_Vlan_4: - - template_Vlan_4 - - link - link_template_VMInt_OAM_lb_8: - - template_VMInt_OAM_lb_8 - - link
\ No newline at end of file + dependency_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - dependency + subinterface_link_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - subinterface_link + binding_template_subint_oam_vmi_4: + - template_subint_oam_vmi_4 + - binding
\ 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/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml index 272d074db8..26f8cd6fb6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested2.yml @@ -115,7 +115,7 @@ resources: virtual_network_refs: [{ get_param: p2 },{ get_param: p1 }] virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_4 }] - server_cmaui: + server_cmaui_2: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml index ee7c6c746c..dd77633e1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested3.yml @@ -116,7 +116,7 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - server_cmaui: + server_cmaui_3: type: OS::Nova::Server properties: name: { get_param: [cmaui_names, 0]} @@ -127,8 +127,20 @@ resources: - port: { get_resource: template_VMInt_OAM_lb_5 } - port: { get_resource: template_VMInt_OAM_lb_6 } + template_VMInt_OAM_lb_8: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, + } + virtual_network_refs: [{ get_param: p1 }] + port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] + security_group_refs: [{ get_param: oam_sec_group_name}] + test_nested4Level: type: nested4.yml properties: p1: { get_param: p1} - p2: { get_param: p2}
\ No newline at end of file + p2: { get_param: p2} + p3: { get_resource: template_VMInt_OAM_lb_8}
\ 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/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml index 264cbd16d2..9c3a2a38e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/nestedMultiLevels/inputfiles/nested4.yml @@ -14,6 +14,8 @@ parameters: description: UID of OAM network p2: type: string + p3: + type: string security_group_name: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -49,29 +51,7 @@ parameters: type: number resources: - template_VMInt_OAM_lb_7: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - template_VMInt_OAM_lb_8: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - - template_Vlan_4: + template_subint_oam_vmi_4: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -112,15 +92,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_8 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_7 } - - port: { get_resource: template_VMInt_OAM_lb_8 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p3 }]
\ 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/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 704468d325..76f8356d76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml node_types: org.openecomp.resource.abstract.nodes.heat.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -50,6 +20,47 @@ node_types: description: UID of OAM network required: true status: SUPPORTED + p3: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p4: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p5: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + virtual_ipv6_address: + type: string + required: true + status: SUPPORTED + lb_st_vlan_type_oam: + type: string + description: dummy + required: true + status: SUPPORTED + mac_address: + type: string + required: true + status: SUPPORTED + availability_zone_0: + type: string + description: availabilityzone name + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED abc_flavor: type: string description: Flavor for CMAUI server @@ -67,10 +78,6 @@ node_types: type: string required: true status: SUPPORTED - virtual_ip_address: - type: string - required: true - status: SUPPORTED abc_names: type: list description: CMAUI1, CMAUI2 server names @@ -96,29 +103,11 @@ node_types: description: Image for CMAUI server required: true status: SUPPORTED - virtual_ipv6_address: - type: string - required: true - status: SUPPORTED cmaui_flavor: type: string description: Flavor for CMAUI server required: true status: SUPPORTED - lb_st_vlan_type_oam: - type: string - description: dummy - required: true - status: SUPPORTED - mac_address: - type: string - required: true - status: SUPPORTED - availability_zone_0: - type: string - description: availabilityzone name - required: true - status: SUPPORTED abc_oam_ips: type: string required: true @@ -127,10 +116,6 @@ node_types: type: string required: true status: SUPPORTED - subinterface_instance_index: - type: float - required: true - status: SUPPORTED cmaui_oam_ips: type: string required: true @@ -141,157 +126,82 @@ node_types: required: true status: SUPPORTED requirements: - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_3: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - local_storage_server_abc: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_abc_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_Vlan_3: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 - - link_template_Vlan_2: - capability: tosca.capabilities.network.Linkable + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + relationship: tosca.relationships.DependsOn occurrences: - - 1 - - 1 - - link_template_Vlan_1: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - capabilities: - scalable_server_abc: - type: tosca.capabilities.Scalable + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - 1 - - UNBOUNDED - binding_template_VMInt_OAM_lb_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_template_VMInt_OAM_lb_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - attachment_abc_port_1: - type: tosca.capabilities.Attachment + - subinterface_link_template_Vlan_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - 1 - - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - 1 - - UNBOUNDED - host_server_abc: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - - UNBOUNDED - os_server_abc: - type: tosca.capabilities.OperatingSystem - occurrences: - 1 - - UNBOUNDED - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - binding_server_abc: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin + capabilities: + feature_template_Vlan_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_abc_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable + feature_template_Vlan_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_server_abc: - type: tosca.capabilities.Endpoint.Admin + feature_template_Vlan_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - binding_template_VMInt_OAM_lb_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.nested2: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -364,64 +274,29 @@ node_types: required: true status: SUPPORTED requirements: - - local_storage_server_cmaui: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - dependency_template_subint_oam_vmi_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - link_cmaui_port_1: - capability: tosca.capabilities.network.Linkable - node: tosca.nodes.Root - relationship: tosca.relationships.network.LinksTo + - binding_template_subint_oam_vmi_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo occurrences: - 1 - 1 capabilities: - host_server_cmaui: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent - occurrences: - - 1 - - UNBOUNDED - os_server_cmaui: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - binding_cmaui_port_1: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - endpoint_server_cmaui: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - binding_server_cmaui: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - scalable_server_cmaui: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - attachment_cmaui_port_1: - type: tosca.capabilities.Attachment + feature_template_subint_oam_vmi_1: + type: tosca.capabilities.Node 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/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml index c26430b3aa..1262fef985 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,38 +2,8 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: @@ -41,16 +11,41 @@ topology_template: shared_network_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id1 type: string description: network name of jsa log network shared_network_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id2 type: string description: network name of jsa log network jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network node_templates: @@ -70,14 +65,33 @@ topology_template: service_template_filter: substitute_service_template: nested2ServiceTemplate.yaml requirements: - - link_cmaui_port_1: + - subinterface_link_template_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + template_VMInt_OAM_lb_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo + test_net3: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name test_nested3: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -90,33 +104,51 @@ topology_template: p2: get_input: shared_network_id2 requirements: - - link_abc_port_1: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net1 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + template_VMInt_OAM_lb_2: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net2 + node: test_net3 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + template_VMInt_OAM_lb_3: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + security_group_refs: + - get_input: jsa_net_name + virtual_network_refs: + - test_net3 + virtual_machine_interface_properties: + service_interface_type: + get_input: jsa_net_name + port_tuple_refs: + - get_input: jsa_net_name + requirements: + - link: capability: tosca.capabilities.network.Linkable - node: test_net1 + node: test_net3 relationship: tosca.relationships.network.LinksTo test_net1: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net @@ -135,32 +167,22 @@ topology_template: get_input: shared_network_id1 p2: get_input: shared_network_id2 + p3: + get_input: template_VMInt_OAM_lb_1 + p4: + get_input: template_VMInt_OAM_lb_2 + p5: + get_input: template_VMInt_OAM_lb_3 requirements: - - link_abc_port_1: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_1: - capability: tosca.capabilities.network.Linkable - node: test_net1 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_2: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_VMInt_OAM_lb_3: - capability: tosca.capabilities.network.Linkable - node: test_net2 - relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -182,5 +204,9 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - test_nested2 + - template_VMInt_OAM_lb_1 + - test_net3 - test_nested3 + - template_VMInt_OAM_lb_2 + - template_VMInt_OAM_lb_3 - test_nested1
\ 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/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index ecc816a2a1..cc627ef792 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -2,45 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested1 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.abc: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -55,6 +20,48 @@ topology_template: immutable: false type: string description: UID of OAM network + p3: + hidden: false + immutable: false + type: string + description: UID of OAM network + p4: + hidden: false + immutable: false + type: string + description: UID of OAM network + p5: + hidden: false + immutable: false + type: string + description: UID of OAM network + virtual_ip_address: + hidden: false + immutable: false + type: string + virtual_ipv6_address: + hidden: false + immutable: false + type: string + lb_st_vlan_type_oam: + hidden: false + immutable: false + type: string + description: dummy + mac_address: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + subinterface_instance_index: + hidden: false + immutable: false + type: float abc_flavor: hidden: false immutable: false @@ -72,10 +79,6 @@ topology_template: hidden: false immutable: false type: string - virtual_ip_address: - hidden: false - immutable: false - type: string abc_names: hidden: false immutable: false @@ -101,30 +104,11 @@ topology_template: immutable: false type: string description: Image for CMAUI server - virtual_ipv6_address: - hidden: false - immutable: false - type: string cmaui_flavor: hidden: false immutable: false type: string description: Flavor for CMAUI server - lb_st_vlan_type_oam: - hidden: false - immutable: false - type: string - description: dummy - mac_address: - hidden: false - immutable: false - type: string - availability_zone_0: - label: availabilityzone name - hidden: false - immutable: false - type: string - description: availabilityzone name abc_oam_ips: hidden: false immutable: false @@ -133,10 +117,6 @@ topology_template: hidden: false immutable: false type: string - subinterface_instance_index: - hidden: false - immutable: false - type: float cmaui_oam_ips: hidden: false immutable: false @@ -147,90 +127,11 @@ topology_template: type: string description: Image for CMAUI server node_templates: - template_VMInt_OAM_lb_1: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: shared_network_id1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_2: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p2 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - template_VMInt_OAM_lb_3: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - security_group_refs: - - get_input: oam_sec_group_name - virtual_network_refs: - - get_input: p2 - - get_input: shared_network_id1 - virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: - get_input: lb_st_interface_type_oam - port_tuple_refs: - - get_input: template_PortTuple_LB1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - server_abc: - type: org.openecomp.resource.vfc.nodes.heat.abc - properties: - flavor: - get_input: abc_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: abc_image - name: - get_input: - - abc_names - - 0 template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_3 + - get_input: p5 name: str_replace: template: $NAME$VLAN @@ -266,34 +167,11 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_3 - relationship: tosca.relationships.network.BindsTo - abc_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - abc_oam_ips - - 0 - network: - get_input: p2 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_abc - relationship: tosca.relationships.network.BindsTo template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_2 + - get_input: p4 name: str_replace: template: $NAME$VLAN @@ -328,16 +206,11 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_2 - relationship: tosca.relationships.network.BindsTo template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 + - get_input: p3 name: str_replace: template: $NAME$VLAN @@ -372,11 +245,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 - relationship: tosca.relationships.network.BindsTo groups: nested1_group: type: org.openecomp.groups.heat.HeatStack @@ -384,88 +252,46 @@ topology_template: heat_file: ../Artifacts/nested1.yml description: cmaui server template for vMMSC members: - - template_VMInt_OAM_lb_1 - - template_VMInt_OAM_lb_2 - - template_VMInt_OAM_lb_3 - - server_cmaui - - server_abc - template_Vlan_3 - - abc_port_1 - template_Vlan_2 - template_Vlan_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested1 capabilities: - scalable_server_abc: - - server_abc - - scalable - os_server_cmaui: - - server_cmaui - - os - binding_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - binding - binding_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - binding - attachment_abc_port_1: - - abc_port_1 - - attachment - scalable_server_cmaui: - - server_cmaui - - scalable - host_server_abc: - - server_abc - - host - os_server_abc: - - server_abc - - os - host_server_cmaui: - - server_cmaui - - host - binding_server_abc: - - server_abc - - binding - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_abc_port_1: - - abc_port_1 - - binding - binding_server_cmaui: - - server_cmaui - - binding - endpoint_server_abc: - - server_abc - - endpoint - binding_template_VMInt_OAM_lb_3: - - template_VMInt_OAM_lb_3 - - binding + feature_template_Vlan_2: + - template_Vlan_2 + - feature + feature_template_Vlan_3: + - template_Vlan_3 + - feature + feature_template_Vlan_1: + - template_Vlan_1 + - feature requirements: - link_template_VMInt_OAM_lb_1: - - template_VMInt_OAM_lb_1 - - link - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_VMInt_OAM_lb_3: - - template_VMInt_OAM_lb_3 - - link - link_template_VMInt_OAM_lb_2: - - template_VMInt_OAM_lb_2 - - link - link_template_Vlan_1: + subinterface_link_template_Vlan_3: + - template_Vlan_3 + - subinterface_link + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + dependency_template_Vlan_2: + - template_Vlan_2 + - dependency + dependency_template_Vlan_1: - template_Vlan_1 - - link - link_template_Vlan_2: + - dependency + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link + binding_template_Vlan_2: - template_Vlan_2 - - link - link_template_Vlan_3: + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding + binding_template_Vlan_3: + - template_Vlan_3 + - binding + dependency_template_Vlan_3: - template_Vlan_3 - - link - link_abc_port_1: - - abc_port_1 - - link - local_storage_server_abc: - - server_abc - - local_storage
\ No newline at end of file + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index e4c9eac43b..5241d3db88 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -2,43 +2,10 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested2 imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml +- openecomp_heat_index: + file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: cmaui_names: @@ -111,24 +78,11 @@ topology_template: immutable: false type: string node_templates: - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - name: - get_input: - - cmaui_names - - 0 - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + template_subint_oam_vmi_1: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - - cmaui_port_1 + - get_input: p2 name: str_replace: template: $NAME$VLAN @@ -163,29 +117,6 @@ topology_template: virtual_machine_interface_mac_addresses: mac_address: - get_input: mac_address - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: cmaui_port_1 - relationship: tosca.relationships.network.BindsTo - cmaui_port_1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - replacement_policy: AUTO - security_groups: - - get_input: security_group_name - fixed_ips: - - ip_address: - get_input: - - cmaui_oam_ips - - 0 - network: - get_input: p1 - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo groups: nested2_group: type: org.openecomp.groups.heat.HeatStack @@ -193,40 +124,20 @@ topology_template: heat_file: ../Artifacts/nested2.yml description: cmaui server template for vMMSC members: - - server_cmaui - - template_Vlan_3 - - cmaui_port_1 + - template_subint_oam_vmi_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested2 capabilities: - host_server_cmaui: - - server_cmaui - - host - os_server_cmaui: - - server_cmaui - - os - binding_cmaui_port_1: - - cmaui_port_1 - - binding - endpoint_server_cmaui: - - server_cmaui - - endpoint - binding_server_cmaui: - - server_cmaui - - binding - scalable_server_cmaui: - - server_cmaui - - scalable - attachment_cmaui_port_1: - - cmaui_port_1 - - attachment + feature_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - feature requirements: - local_storage_server_cmaui: - - server_cmaui - - local_storage - link_template_Vlan_3: - - template_Vlan_3 - - link - link_cmaui_port_1: - - cmaui_port_1 - - link
\ No newline at end of file + dependency_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - dependency + subinterface_link_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - subinterface_link + binding_template_subint_oam_vmi_1: + - template_subint_oam_vmi_1 + - binding
\ 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/VlanToNetConnection/shared/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml index 507bfcaa08..6be5882f0d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/addOn.yml @@ -4,6 +4,10 @@ description: > Version 2.0 02-09-2016 (Authors: John Doe, user PROD) parameters: + jsa_net_name: + type: string + description: network name of jsa log network + shared_network_id1: type: string description: network name of jsa log network @@ -14,11 +18,21 @@ parameters: resources: + test_net3: + type: OS::Neutron::Net + properties: + name: {get_param: jsa_net_name} + shared: True + test_nested1: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} p2: { get_param: shared_network_id2} + p3: { get_param: template_VMInt_OAM_lb_1} + p4: { get_param: template_VMInt_OAM_lb_2} + p5: { get_param: template_VMInt_OAM_lb_3} + test_nested2: type: nested2.yml @@ -29,4 +43,38 @@ resources: type: nested1.yml properties: shared_network_id1: { get_param: shared_network_id1} - p2: { get_param: shared_network_id2}
\ No newline at end of file + p2: { get_param: shared_network_id2} + + template_VMInt_OAM_lb_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + + template_VMInt_OAM_lb_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}] + + template_VMInt_OAM_lb_3: + type: OS::ContrailV2::VirtualMachineInterface + properties: + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_service_interface_type: { get_param: jsa_net_name }, + } + virtual_network_refs: [{ get_resource: test_net3 }] + port_tuple_refs: [{ get_param: jsa_net_name }] + security_group_refs: [{ get_param: jsa_net_name}]
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml index 6687a32f2a..ce0336d766 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested1.yml @@ -9,6 +9,15 @@ parameters: p2: type: string description: UID of OAM network + p3: + type: string + description: UID of OAM network + p4: + type: string + description: UID of OAM network + p5: + type: string + description: UID of OAM network cmaui_names: type: comma_delimited_list description: CMAUI1, CMAUI2 server names @@ -61,17 +70,6 @@ parameters: type: number resources: - template_VMInt_OAM_lb_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_1: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -113,18 +111,7 @@ resources: ] } virtual_network_refs: [{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - template_VMInt_OAM_lb_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p3 }] template_Vlan_2: type: OS::ContrailV2::VirtualMachineInterface @@ -167,18 +154,7 @@ resources: ] } virtual_network_refs: [{ get_param: p2 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_2 }] - - template_VMInt_OAM_lb_3: - type: OS::ContrailV2::VirtualMachineInterface - properties: - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_service_interface_type: { get_param: lb_st_interface_type_oam }, - } - virtual_network_refs: [{ get_param: p2 },{ get_param: shared_network_id1 }] - port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] - security_group_refs: [{ get_param: oam_sec_group_name}] + virtual_machine_interface_refs: [{ get_param: p4 }] template_Vlan_3: type: OS::ContrailV2::VirtualMachineInterface @@ -221,34 +197,4 @@ resources: ] } virtual_network_refs: [{ get_param: p2 },{ get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_3 }] - - abc_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p2 } - fixed_ips: [{"ip_address": {get_param: [abc_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 } - - port: { get_resource: template_VMInt_OAM_lb_3 } - - server_abc: - type: OS::Nova::Server - properties: - name: { get_param: [abc_names, 0]} - image: { get_param: abc_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: abc_flavor } - networks: - - port: { get_resource: abc_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p5 }] diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml index 0381298528..1e5a41699b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/shared/inputfiles/nested2.yml @@ -43,15 +43,7 @@ parameters: type: number resources: - cmaui_port_1: - type: OS::Neutron::Port - properties: - network: { get_param: p1 } - fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] - security_groups: [{get_param: security_group_name}] - replacement_policy: AUTO - - template_Vlan_3: + template_subint_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -92,14 +84,4 @@ resources: ] } virtual_network_refs: [{ get_param: p1 }] - virtual_machine_interface_refs: [{ get_resource: cmaui_port_1 }] - - server_cmaui: - type: OS::Nova::Server - properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: cmaui_port_1 }
\ No newline at end of file + virtual_machine_interface_refs: [{ get_param: p2 }]
\ 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/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml new file mode 100644 index 0000000000..1be71bb7c5 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -0,0 +1,203 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.heat.subinterface.vlan: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + cmaui_names: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + p1: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p2: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p3: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + p4: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + template_PortTuple_LB1: + type: string + required: true + status: SUPPORTED + p5: + type: string + description: UID of OAM network + required: true + status: SUPPORTED + oam_sec_group_name: + type: string + required: true + status: SUPPORTED + lb_st_interface_type_oam: + type: string + required: true + status: SUPPORTED + virtual_ip_address: + type: string + required: true + status: SUPPORTED + security_group_name: + type: list + description: CMAUI1, CMAUI2 server names + required: true + status: SUPPORTED + entry_schema: + type: string + shared_network_id: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + vlan_ids: + type: string + required: true + status: SUPPORTED + shared_network_id1: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + cmaui_image: + type: string + description: Image for CMAUI server + required: true + status: SUPPORTED + virtual_ipv6_address: + type: string + required: true + status: SUPPORTED + cmaui_flavor: + type: string + description: Flavor for CMAUI server + required: true + status: SUPPORTED + shared_network_id2: + type: list + description: Flavor for CMAUI server + required: true + status: SUPPORTED + entry_schema: + type: string + lb_st_vlan_type_oam: + type: string + description: dummy + required: true + status: SUPPORTED + mac_address: + type: string + required: true + status: SUPPORTED + availability_zone_0: + type: string + description: availabilityzone name + required: true + status: SUPPORTED + subinterface_name_prefix: + type: string + required: true + status: SUPPORTED + subinterface_instance_index: + type: float + required: true + status: SUPPORTED + cmaui_oam_ips: + type: string + required: true + status: SUPPORTED + requirements: + - dependency_template_Vlan_3: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_3: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_Vlan_3: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + - dependency_template_Vlan_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_Vlan_2: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + - dependency_template_Vlan_1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_template_Vlan_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_template_Vlan_1: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_template_Vlan_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_3: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + feature_template_Vlan_1: + type: tosca.capabilities.Node + 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/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index ab9cc09215..d22c84d7fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -2,46 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: -- CommonGlobalTypes: - file: CommonGlobalTypesServiceTemplate.yaml -- NovaServerGlobalTypes: - file: NovaServerGlobalTypesServiceTemplate.yaml -- NeutronPortGlobalTypes: - file: NeutronPortGlobalTypesServiceTemplate.yaml -- NeutronSecurityRulesGlobalTypes: - file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml -- NeutronNetGlobalTypes: - file: NeutronNetGlobalTypesServiceTemplate.yaml -- CinderVolumeGlobalTypes: - file: CinderVolumeGlobalTypesServiceTemplate.yaml -- ContrailVirtualNetworkGlobalType: - file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailNetworkRuleGlobalType: - file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml -- AbstractSubstituteGlobalTypes: - file: AbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualMachineInterfaceGlobalType: - file: ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml -- ContrailComputeGlobalTypes: - file: ContrailComputeGlobalTypesServiceTemplate.yaml -- ContrailPortGlobalTypes: - file: ContrailPortGlobalTypesServiceTemplate.yaml -- ContrailAbstractSubstituteGlobalTypes: - file: ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml -- ContrailV2VirtualNetworkGlobalType: - file: ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml -- ContrailV2NetworkRuleGlobalType: - file: ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml -- ContrailV2VLANSubInterfaceGlobalType: - file: ContrailV2VLANSubInterfaceGlobalTypeServiceTemplate.yaml -node_types: - org.openecomp.resource.vfc.nodes.heat.cmaui: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: cmaui_names: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_names type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -49,27 +26,75 @@ topology_template: p1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: p1 type: string description: UID of OAM network template_PortTuple_LB1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: template_PortTuple_LB1 type: string oam_sec_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: oam_sec_group_name type: string lb_st_interface_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_interface_type_oam type: string virtual_ip_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ip_address type: string security_group_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: security_group_name type: list description: CMAUI1, CMAUI2 server names entry_schema: @@ -77,39 +102,103 @@ topology_template: shared_network_id: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id type: string description: Flavor for CMAUI server jsa_net_name: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name type: string description: network name of jsa log network vlan_ids: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: vlan_ids type: string shared_network_id1: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id1 type: string description: Flavor for CMAUI server cmaui_image: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_image type: string description: Image for CMAUI server virtual_ipv6_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: virtual_ipv6_address type: string cmaui_flavor: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_flavor type: string description: Flavor for CMAUI server shared_network_id2: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: shared_network_id2 type: list description: Flavor for CMAUI server entry_schema: @@ -117,29 +206,77 @@ topology_template: lb_st_vlan_type_oam: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: lb_st_vlan_type_oam type: string description: dummy mac_address: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: mac_address type: string availability_zone_0: label: availabilityzone name hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: availability_zone_0 type: string description: availabilityzone name subinterface_name_prefix: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_name_prefix type: string subinterface_instance_index: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: subinterface_instance_index type: float cmaui_oam_ips: hidden: false immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - addOn + source_type: HEAT + param_name: cmaui_oam_ips type: string node_templates: template_VMInt_OAM_lb_1: @@ -150,7 +287,7 @@ topology_template: virtual_network_refs: - get_input: shared_network_id virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -159,10 +296,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_2: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -172,7 +305,7 @@ topology_template: - get_input: shared_network_id - get_input: shared_network_id1 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -181,10 +314,6 @@ topology_template: capability: tosca.capabilities.network.Linkable node: test_net relationship: tosca.relationships.network.LinksTo - - binding: - capability: tosca.capabilities.network.Bindable - node: server_cmaui - relationship: tosca.relationships.network.BindsTo template_VMInt_OAM_lb_3: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: @@ -195,7 +324,7 @@ topology_template: - shared_network_id2 - 0 virtual_machine_interface_properties: - virtual_machine_interface_properties_service_interface_type: + service_interface_type: get_input: lb_st_interface_type_oam port_tuple_refs: - get_input: template_PortTuple_LB1 @@ -205,169 +334,39 @@ topology_template: shared: true network_name: get_input: jsa_net_name - server_cmaui: - type: org.openecomp.resource.vfc.nodes.heat.cmaui - properties: - flavor: - get_input: cmaui_flavor - availability_zone: - get_input: availability_zone_0 - image: - get_input: cmaui_image - contrail_service_instance_ind: true - name: - get_input: - - cmaui_names - - 0 - test_net: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_input: jsa_net_name - template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + test_nested1: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan + directives: + - substitutable properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: - - shared_network_id2 - - 0 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address + service_template_filter: + substitute_service_template: vlanServiceTemplate.yaml + shared_network_id1: + get_input: shared_network_id1 + p2: + get_input: shared_network_id2 + p3: template_VMInt_OAM_lb_1 + p4: template_VMInt_OAM_lb_2 + p5: template_VMInt_OAM_lb_3 requirements: - - binding: + - binding_template_Vlan_3: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_3 relationship: tosca.relationships.network.BindsTo - template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - - get_input: shared_network_id1 - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_2: capability: tosca.capabilities.network.Bindable - node: template_VMInt_OAM_lb_1 + node: template_VMInt_OAM_lb_2 relationship: tosca.relationships.network.BindsTo - template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - properties: - virtual_machine_interface_refs: - - template_VMInt_OAM_lb_1 - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: - get_input: subinterface_name_prefix - $VLAN: - get_input: - - vlan_ids - - get_input: subinterface_instance_index - virtual_network_refs: - - get_input: shared_network_id - virtual_machine_interface_properties: - sub_interface_vlan_tag: - get_input: lb_st_vlan_type_oam - virtual_machine_interface_allowed_address_pairs: - allowed_address_pair: - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ip_address - ip_prefix_len: 32 - mac: - get_input: mac_address - - address_mode: active-standby - ip: - ip_prefix: - get_input: virtual_ipv6_address - ip_prefix_len: 128 - mac: - get_input: mac_address - virtual_machine_interface_mac_addresses: - mac_address: - - get_input: mac_address - requirements: - - link: - capability: tosca.capabilities.network.Linkable - node: test_net - relationship: tosca.relationships.network.LinksTo - - binding: + - binding_template_Vlan_1: capability: tosca.capabilities.network.Bindable node: template_VMInt_OAM_lb_1 relationship: tosca.relationships.network.BindsTo + test_net: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + shared: true + network_name: + get_input: jsa_net_name groups: main_group: type: org.openecomp.groups.heat.HeatStack @@ -387,7 +386,4 @@ topology_template: - template_VMInt_OAM_lb_1 - template_VMInt_OAM_lb_2 - template_VMInt_OAM_lb_3 - - server_cmaui - - template_Vlan_3 - - template_Vlan_2 - - template_Vlan_1
\ No newline at end of file + - test_nested1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml new file mode 100644 index 0000000000..b0301d5efd --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/expectedoutputfiles/vlanServiceTemplate.yaml @@ -0,0 +1,298 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + cmaui_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + immutable: false + type: string + description: UID of OAM network + p3: + hidden: false + immutable: false + type: string + description: UID of OAM network + p4: + hidden: false + immutable: false + type: string + description: UID of OAM network + template_PortTuple_LB1: + hidden: false + immutable: false + type: string + p5: + hidden: false + immutable: false + type: string + description: UID of OAM network + oam_sec_group_name: + hidden: false + immutable: false + type: string + lb_st_interface_type_oam: + hidden: false + immutable: false + type: string + virtual_ip_address: + hidden: false + immutable: false + type: string + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + shared_network_id: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + vlan_ids: + hidden: false + immutable: false + type: string + shared_network_id1: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + cmaui_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + virtual_ipv6_address: + hidden: false + immutable: false + type: string + cmaui_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + shared_network_id2: + hidden: false + immutable: false + type: list + description: Flavor for CMAUI server + entry_schema: + type: string + lb_st_vlan_type_oam: + hidden: false + immutable: false + type: string + description: dummy + mac_address: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + subinterface_name_prefix: + hidden: false + immutable: false + type: string + subinterface_instance_index: + hidden: false + immutable: false + type: float + cmaui_oam_ips: + hidden: false + immutable: false + type: string + node_templates: + template_Vlan_3: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p5 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: + - shared_network_id2 + - 0 + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + template_Vlan_2: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p4 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: shared_network_id + - get_input: shared_network_id1 + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + template_Vlan_1: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: p3 + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: + get_input: subinterface_name_prefix + $VLAN: + get_input: + - vlan_ids + - get_input: subinterface_instance_index + virtual_network_refs: + - get_input: shared_network_id + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: lb_st_vlan_type_oam + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ip_address + ip_prefix_len: 32 + mac: + get_input: mac_address + - address_mode: active-standby + ip: + ip_prefix: + get_input: virtual_ipv6_address + ip_prefix_len: 128 + mac: + get_input: mac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan.yml + description: cmaui server template for vMMSC + members: + - template_Vlan_3 + - template_Vlan_2 + - template_Vlan_1 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan + capabilities: + feature_template_Vlan_2: + - template_Vlan_2 + - feature + feature_template_Vlan_3: + - template_Vlan_3 + - feature + feature_template_Vlan_1: + - template_Vlan_1 + - feature + requirements: + subinterface_link_template_Vlan_3: + - template_Vlan_3 + - subinterface_link + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + dependency_template_Vlan_2: + - template_Vlan_2 + - dependency + dependency_template_Vlan_1: + - template_Vlan_1 + - dependency + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link + binding_template_Vlan_2: + - template_Vlan_2 + - binding + binding_template_Vlan_1: + - template_Vlan_1 + - binding + binding_template_Vlan_3: + - template_Vlan_3 + - binding + dependency_template_Vlan_3: + - template_Vlan_3 + - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json index 1f762d0ccc..3346702d2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/MANIFEST.json @@ -12,6 +12,11 @@ "file": "addOn.yml", "type": "HEAT", "isBase": "false" + }, + { + "file": "vlan.yml", + "type": "HEAT", + "isBase": "false" } ] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml index 41c8f74ff3..b49b2ca96f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/addOn.yml @@ -67,49 +67,6 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_1: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: shared_network_id }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - template_VMInt_OAM_lb_2: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -121,49 +78,6 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_2: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: shared_network_id }, { get_param: shared_network_id1 }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - template_VMInt_OAM_lb_3: type: OS::ContrailV2::VirtualMachineInterface properties: @@ -175,56 +89,11 @@ resources: port_tuple_refs: [{ get_param: template_PortTuple_LB1 }] security_group_refs: [{ get_param: oam_sec_group_name}] - template_Vlan_3: - type: OS::ContrailV2::VirtualMachineInterface - properties: - name: - str_replace: - template: $NAME$VLAN - params: - $NAME: { get_param: subinterface_name_prefix } - $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } - virtual_machine_interface_properties: - { - virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } - } - virtual_machine_interface_mac_addresses: - { - virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], - } - virtual_machine_interface_allowed_address_pairs: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 - } - }, - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: - { - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, - virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 - } - } - ] - } - virtual_network_refs: [{ get_param: [ shared_network_id2, 0] }] - virtual_machine_interface_refs: [{ get_resource: template_VMInt_OAM_lb_1 }] - - server_cmaui: - type: OS::Nova::Server + test_nested1: + type: vlan.yml properties: - name: { get_param: [cmaui_names, 0]} - image: { get_param: cmaui_image } - availability_zone: { get_param: availability_zone_0 } - flavor: { get_param: cmaui_flavor } - networks: - - port: { get_resource: template_VMInt_OAM_lb_1 } - - port: { get_resource: template_VMInt_OAM_lb_2 }
\ No newline at end of file + shared_network_id1: { get_param: shared_network_id1} + p2: { get_param: shared_network_id2} + p3: { get_resource: template_VMInt_OAM_lb_1} + p4: { get_resource: template_VMInt_OAM_lb_2} + p5: { get_resource: template_VMInt_OAM_lb_3}
\ 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/VlanToNetConnection/sharedAddOn/inputfiles/vlan.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/vlan.yml new file mode 100644 index 0000000000..dbc5887313 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VlanToNetConnection/sharedAddOn/inputfiles/vlan.yml @@ -0,0 +1,198 @@ +heat_template_version: 2013-05-23 + +description: cmaui server template for vMMSC + +parameters: + p1: + type: string + description: UID of OAM network + p2: + type: string + description: UID of OAM network + p3: + type: string + description: UID of OAM network + p4: + type: string + description: UID of OAM network + p5: + type: string + description: UID of OAM network + cmaui_names: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + security_group_name: + type: comma_delimited_list + description: CMAUI1, CMAUI2 server names + cmaui_image: + type: string + description: Image for CMAUI server + availability_zone_0: + type: string + label: availabilityzone name + description: availabilityzone name + cmaui_flavor: + type: string + description: Flavor for CMAUI server + shared_network_id: + type: string + description: Flavor for CMAUI server + shared_network_id1: + type: string + description: Flavor for CMAUI server + shared_network_id2: + type: comma_delimited_list + description: Flavor for CMAUI server + cmaui_oam_ips: + type: string + oam_sec_group_name: + type: string + lb_st_interface_type_oam: + type: string + template_PortTuple_LB1: + type: string + lb_st_vlan_type_oam: + description: dummy + type: string + mac_address: + type: string + virtual_ip_address: + type: string + virtual_ipv6_address: + type: string + vlan_ids: + type: string + subinterface_name_prefix: + type: string + subinterface_instance_index: + type: number + +resources: + template_Vlan_1: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: shared_network_id }] + virtual_machine_interface_refs: [{ get_param: p3}] + + template_Vlan_2: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: shared_network_id }, { get_param: shared_network_id1 }] + virtual_machine_interface_refs: [{ get_param: p4}] + + template_Vlan_3: + type: OS::ContrailV2::VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME$VLAN + params: + $NAME: { get_param: subinterface_name_prefix } + $VLAN: { get_param: [ vlan_ids, { get_param: subinterface_instance_index } ] } + virtual_machine_interface_properties: + { + virtual_machine_interface_properties_sub_interface_vlan_tag: { get_param: lb_st_vlan_type_oam } + } + virtual_machine_interface_mac_addresses: + { + virtual_machine_interface_mac_addresses_mac_address: [{ get_param: mac_address }], + } + virtual_machine_interface_allowed_address_pairs: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair: [ + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ip_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 32 + } + }, + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_address_mode: active-standby, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_mac: { get_param: mac_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip: + { + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix: { get_param: virtual_ipv6_address }, + virtual_machine_interface_allowed_address_pairs_allowed_address_pair_ip_ip_prefix_len: 128 + } + } + ] + } + virtual_network_refs: [{ get_param: [ shared_network_id2, 0] }] + virtual_machine_interface_refs: [{ get_param: p5}]
\ 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/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 49b834be32..f890787ebd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -238,6 +238,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -245,6 +246,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index cc66cebec3..bf2b9ada70 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -96,6 +102,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_plt_internal_0_port_subnetpoolid: type: string required: true @@ -242,6 +254,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_plt_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_plt_oam_0_port_replacement_policy: type: list required: true @@ -528,6 +546,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -570,6 +589,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -605,6 +625,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -784,6 +805,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_app_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_app_scheduler_hints: type: list required: true @@ -800,6 +827,12 @@ node_types: type: string required: true status: SUPPORTED + port_app_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_app_oam_0_port_replacement_policy: type: list required: true @@ -848,6 +881,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_app_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_app_data_0_port_network: type: list required: true @@ -1208,6 +1247,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1469,6 +1509,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1511,6 +1552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1546,6 +1588,12 @@ node_types: org.openecomp.resource.abstract.nodes.iox: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_iox_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_iox_data_0_port_ip_requirements: type: list required: true @@ -1568,6 +1616,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_iox_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true @@ -1576,6 +1630,12 @@ node_types: type: string required: true status: SUPPORTED + port_iox_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_iox_data_0_port_allowed_address_pairs: type: list required: true @@ -2038,6 +2098,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2074,6 +2135,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2149,6 +2211,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 3557f27f17..83bc172858 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -918,6 +918,8 @@ topology_template: directives: - substitutable properties: + port_iox_oam_0_port_subinterface_indicator: + - true port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -937,8 +939,12 @@ topology_template: params: $vnf_name: get_input: vnf_name + port_iox_internal_0_port_subinterface_indicator: + - true vm_flavor_name: get_input: iox_flavor_name + port_iox_data_0_port_subinterface_indicator: + - true port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1072,6 +1078,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1085,6 +1093,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1106,6 +1116,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1238,6 +1250,8 @@ topology_template: directives: - substitutable properties: + port_iox_oam_0_port_subinterface_indicator: + - true port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1257,8 +1271,12 @@ topology_template: params: $vnf_name: get_input: vnf_name + port_iox_internal_0_port_subinterface_indicator: + - true vm_flavor_name: get_input: iox_flavor_name + port_iox_data_0_port_subinterface_indicator: + - true port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1387,6 +1405,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1400,6 +1420,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1426,6 +1448,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1526,6 +1550,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1539,6 +1565,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1565,6 +1593,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1693,6 +1723,8 @@ topology_template: get_input: - plt_data_v6_ips - 1 + port_plt_oam_0_port_subinterface_indicator: + - true vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1726,6 +1758,8 @@ topology_template: - fixed_ips - 0 - ip_address + port_plt_internal_0_port_subinterface_indicator: + - true port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1796,6 +1830,8 @@ topology_template: - get_input: data_net_id port_plt_oam_0_port_network: - get_input: oam_net_id + port_plt_data_0_port_subinterface_indicator: + - true port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: @@ -1839,6 +1875,8 @@ topology_template: get_input: - plt_data_v6_ips - 0 + port_plt_oam_0_port_subinterface_indicator: + - true vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1872,6 +1910,8 @@ topology_template: - fixed_ips - 0 - ip_address + port_plt_internal_0_port_subinterface_indicator: + - true port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1947,6 +1987,8 @@ topology_template: - get_input: data_net_id port_plt_oam_0_port_network: - get_input: oam_net_id + port_plt_data_0_port_subinterface_indicator: + - true port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: @@ -2074,4 +2116,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - app_server_group_group
\ No newline at end of file + - app_server_group_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 6b96a09918..3723fc133f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_app_data_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_app_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_app_scheduler_hints: type: list required: true @@ -27,6 +32,11 @@ topology_template: port_app_data_0_port_network_role: type: string required: true + port_app_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_app_oam_0_port_replacement_policy: type: list required: true @@ -66,6 +76,11 @@ topology_template: port_app_oam_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_app_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_app_data_0_port_network: type: list required: true @@ -275,6 +290,10 @@ topology_template: get_input: port_app_internal_0_port_exCP_naming vlan_requirements: get_input: port_app_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_internal_0_port_ip_requirements network_role_tag: @@ -315,6 +334,10 @@ topology_template: get_input: port_app_oam_0_port_exCP_naming vlan_requirements: get_input: port_app_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_oam_0_port_ip_requirements network_role_tag: @@ -359,6 +382,10 @@ topology_template: get_input: port_app_data_0_port_exCP_naming vlan_requirements: get_input: port_app_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_data_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index 993bf81e24..bdd2d98bfc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_iox_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_iox_data_0_port_ip_requirements: type: list required: true @@ -29,12 +34,22 @@ topology_template: required: true entry_schema: type: string + port_iox_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true port_iox_data_0_port_subnetpoolid: type: string required: true + port_iox_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_iox_data_0_port_allowed_address_pairs: type: list required: true @@ -245,6 +260,10 @@ topology_template: get_input: port_iox_data_0_port_exCP_naming vlan_requirements: get_input: port_iox_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_data_0_port_ip_requirements network_role_tag: @@ -322,6 +341,10 @@ topology_template: get_input: port_iox_oam_0_port_exCP_naming vlan_requirements: get_input: port_iox_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_oam_0_port_ip_requirements network_role_tag: @@ -368,6 +391,10 @@ topology_template: get_input: port_iox_internal_0_port_exCP_naming vlan_requirements: get_input: port_iox_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index 0b2fd5b0af..bb4b53504b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -48,6 +48,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -82,6 +87,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_plt_internal_0_port_subnetpoolid: type: string required: true @@ -200,6 +210,11 @@ topology_template: required: true entry_schema: type: string + port_plt_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_plt_oam_0_port_replacement_policy: type: list required: true @@ -245,6 +260,10 @@ topology_template: get_input: port_plt_internal_0_port_exCP_naming vlan_requirements: get_input: port_plt_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_internal_0_port_ip_requirements network_role_tag: @@ -287,6 +306,10 @@ topology_template: get_input: port_plt_data_0_port_exCP_naming vlan_requirements: get_input: port_plt_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_data_0_port_ip_requirements network_role_tag: @@ -364,6 +387,10 @@ topology_template: get_input: port_plt_oam_0_port_exCP_naming vlan_requirements: get_input: port_plt_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_oam_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index 4ac6d1cefc..0c180fdd82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -167,6 +167,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -213,6 +215,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -259,6 +263,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -284,4 +290,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index f4da23c7be..742b2b4f84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -353,6 +353,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -402,6 +404,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -446,6 +450,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -467,4 +473,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml index 163815ac07..7dc3464c69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml @@ -158,6 +158,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_external_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -209,6 +211,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -255,6 +259,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml index aa0281b2f1..d3b8ed789c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -74,6 +74,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -315,6 +321,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index cbffa79eb2..4f7ddc84ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -194,6 +194,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -244,6 +246,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml index 67acf54036..3a4992f5c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -126,6 +131,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml index 7e9e3ffb2b..6fc6c1549f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml @@ -619,6 +619,8 @@ topology_template: - get_input: availability_zone_0 compute_sbg_sc_user_data_format: - RAW + port_sbg_sc_internal_0_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 @@ -637,4 +639,4 @@ topology_template: members: - sbg_pl_trunk_subport_avpn_group_1 - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc + - abstract_sbg_sc
\ 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/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml index 495bfae010..61d099e538 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml @@ -356,6 +356,8 @@ topology_template: - get_input: availability_zone_0 compute_sbg_sc_user_data_format: - RAW + port_sbg_sc_internal_0_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 @@ -373,4 +375,4 @@ topology_template: SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair members: - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc + - abstract_sbg_sc
\ 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/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml index c4d6a232e3..f784ee7404 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml @@ -623,8 +623,12 @@ topology_template: get_input: - sbg_internal_mac_addresses - 0 + port_sbg_sc_management_1_port_subinterface_indicator: + - true compute_sbg_sc_availability_zone: - get_input: availability_zone_0 + port_sbg_sc_internal_0_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 @@ -642,4 +646,4 @@ topology_template: SC1, SC2, PL3 and PL4. This is the main template, to be used to create an initial stack, with 1 mated pair members: - sbg_pl_trunk_subport_avpn_group_0 - - abstract_sbg_sc + - abstract_sbg_sc
\ 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/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml index 3898eb4260..cca1b0f9cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml @@ -623,8 +623,12 @@ topology_template: get_input: - sbg_internal_mac_addresses - 0 + port_sbg_sc_management_1_port_subinterface_indicator: + - true compute_sbg_sc_availability_zone: - get_input: availability_zone_0 + port_sbg_sc_internal_0_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 @@ -691,4 +695,4 @@ topology_template: members: - sbg_pl_trunk_subport_avpn_group_0 - nested_sbg - - abstract_sbg_sc + - abstract_sbg_sc
\ 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/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml index fdd682a34a..47b653691d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml @@ -1033,8 +1033,12 @@ topology_template: get_input: - sbg_internal_mac_addresses - 0 + port_sbg_sc_management_1_port_subinterface_indicator: + - true compute_sbg_sc_availability_zone: - get_input: availability_zone_0 + port_sbg_sc_internal_0_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_sbg_scServiceTemplate.yaml count: 1 @@ -1107,4 +1111,4 @@ topology_template: - sbg_pl_trunk_subport_avpn_group_0 - sbg_pl_trunk_1_port_0 - sbg_pl_internal_0_port_0 - - abstract_sbg_sc + - abstract_sbg_sc
\ 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/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index b309238988..f315b706ff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -309,6 +309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -358,6 +359,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -365,6 +367,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -372,6 +375,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -960,6 +964,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1058,6 +1068,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -1244,6 +1260,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1293,6 +1310,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1992,6 +2010,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2005,6 +2024,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2118,6 +2138,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2158,6 +2184,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2329,6 +2361,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2388,6 +2421,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2672,6 +2706,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2736,6 +2776,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -3002,6 +3048,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3020,6 +3067,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3277,6 +3325,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -3331,6 +3385,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -3586,6 +3646,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3718,6 +3779,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3817,6 +3879,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3951,6 +4019,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4156,6 +4230,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4211,6 +4286,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4488,10 +4564,22 @@ node_types: type: integer required: true status: SUPPORTED + port_1a_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_1a_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -4749,6 +4837,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4908,6 +4997,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4990,6 +5080,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5044,6 +5140,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -5305,6 +5407,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5437,6 +5540,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index 7bd4091fee..6c49d65da0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -1,1263 +1,1289 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- ppds_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ppds_net_name
- type: string
- a_single_1a_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: a_single_1a_names
- type: string
- pcm_server_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_server_names
- type: string
- pcm_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_image_name
- type: string
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: security_group_name
- type: string
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- entry_schema:
- type: string
- 1c2_catalog_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c2_catalog_instance_names
- type: string
- pcm_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_flavor_name
- type: string
- b_single_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: b_single_1b_names
- type: string
- 1c1_scalling_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c1_scalling_instance_names
- type: string
- myIPs:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: myIPs
- type: string
- net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: net_name
- type: string
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: oam_net_name
- type: string
- node_templates:
- abstract_b_single_1b:
- type: org.openecomp.resource.abstract.nodes.b_single_1b
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_b_single_1b_metadata:
- - connectivityTo4PNested:
- get_attribute:
- - 4p_nested
- - server_pcm_id
- connectivityTo1C2_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- connectivityToNoUnifiedNested:
- get_attribute:
- - nestedNoUnified
- - portId
- connectivityTo1C1_T1_1:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_0:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t1_port_tenant_id
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_b_single_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c1_scalling_instance:
- type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance
- directives:
- - substitutable
- properties:
- compute_1c1_scalling_instance_user_data_format:
- - RAW2
- - RAW1
- port_1c1_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_1c1_scalling_instance_name:
- - get_input:
- - 1c1_scalling_instance_names
- - 2
- - get_input:
- - 1c1_scalling_instance_names
- - 1
- port_1c1_t1_port_name:
- - 1c1_t1_port_1
- - 1c1_t1_port_0
- port_1c1_t1_port_network:
- - 1c1_scalling_instance_network
- - 1c1_scalling_instance_network
- port_1c1_t2_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_network:
- - get_input: ppds_net_name
- - get_input: ppds_net_name
- port_1c1_t1_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c1_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c1_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c1_scalling_instance_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- port_1c1_t2_port_name:
- - 1c1_t2_port_1
- - 1c1_t2_port_0
- compute_1c1_scalling_instance_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- compute_1c1_scalling_instance_metadata:
- - null
- - connectivityTo4PNested:
- get_attribute:
- - 4p_nested
- - server_pcm_id
- connectivityTo1C2_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1A:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityTo1C2_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- connectivityToNoUnifiedNested:
- get_attribute:
- - nestedNoUnified
- - portId
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- service_template_filter:
- substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c1_scalling_instance_1c1_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c1_scalling_instance_network
- relationship: tosca.relationships.network.LinksTo
- b_single_1b_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 4p_nested:
- type: org.openecomp.resource.abstract.nodes.heat.pcm_server
- directives:
- - substitutable
- properties:
- port_pcm_port_00_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo1C2_1:
- get_attribute:
- - 1c201_catalog_instance_1C2
- - instance_name
- connectivityTo1C2_2:
- get_attribute:
- - 1c202_scalling_instance_1C2
- - instance_name
- connectivityTo1A:
- get_attribute:
- - 1a_single_1A
- - instance_name
- connectivityTo1B02:
- get_attribute:
- - 1b02_single_1B
- - instance_name
- - get_attribute:
- - 1b01_single_1B
- - instance_name
- connectivityTo1B01:
- get_attribute:
- - 1b01_single_1B
- - instance_name
- connectivityTo1C1_T2_1:
- get_attribute:
- - 1c1_t2_port_1
- - tenant_id
- connectivityTo1C1_T2_0:
- get_attribute:
- - 1c1_t2_port_0
- - tenant_id
- pcm_image_name:
- get_input: pcm_image_name
- port_pcm_port_00_mac_requirements:
- mac_count_required:
- is_required: false
- 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
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- 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:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- port_pcm_port_01_network_role_tag: oam
- requirements:
- - link_pcm_port_00:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_0:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_metadata:
- - connectivityTo4PNested:
- get_attribute:
- - 4p_nested
- - server_pcm_id
- connectivityTo1A:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityToNoUnifiedNested:
- get_attribute:
- - nestedNoUnified
- - portId
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1C1_T2_1:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- connectivityTo1C1_T2_0:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 1
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - RAW1
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_1:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 2
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- 1c1_scalling_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- nodeGetAttIn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_agent_ids:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- tenant_id:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- admin_state_up:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- qos_policy:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- network_name:
- get_attribute:
- - nestedNoUnified
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- value_specs:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- dependsOn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedNoUnified
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 4p_nested
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance_1c1_t2_port
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a_1a_t1_port
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- abstract_a_single_1a:
- type: org.openecomp.resource.abstract.nodes.a_single_1a
- directives:
- - substitutable
- properties:
- compute_a_single_1a_metadata:
- - connectivityTo4PNested:
- get_attribute:
- - 4p_nested
- - server_pcm_id
- connectivityTo1C2_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- connectivityToNoUnifiedNested:
- get_attribute:
- - nestedNoUnified
- - portId
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1C1_T2_1:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- connectivityTo1C1_T2_0:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- port_1a_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1a_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1a_t2_port_network:
- - get_input: ppds_net_name
- port_1a_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1a_t1_port_network:
- - a_single_1a_network
- vm_image_name:
- get_input: pd_image_name
- port_1a_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_a_single_1a_availability_zone:
- - get_input: availabilityzone_name
- compute_a_single_1a_scheduler_hints:
- - group: BE_Affinity_group
- compute_a_single_1a_user_data_format:
- - RAW
- compute_a_single_1a_name:
- - get_input:
- - a_single_1a_names
- - 0
- port_1a_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_a_single_1a_1a_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: a_single_1a_network
- relationship: tosca.relationships.network.LinksTo
- nestedNoUnified:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
- directives:
- - substitutable
- properties:
- pcm_flavor_name:
- get_input: pcm_flavor_name
- service_template_filter:
- substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo1C2_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- connectivityTo1A:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1C1_T2_1:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- connectivityTo1C1_T2_0:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_2:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- - link_pcm_port_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- nested_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- jsa_security_group:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- get_input: security_group_name
- description: ems security group
- rules:
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: egress
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: ingress
- requirements:
- - port:
- capability: attachment_pcm_port_00
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_01
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_0
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_2
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_3
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- abstract_b_single_1b_1:
- type: org.openecomp.resource.abstract.nodes.b_single_1b_1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1b_t1_port_value_specs:
- - get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- port_1b_t1_port_network_role_tag: oam
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- port_1b_t1_port_network:
- - get_input: oam_net_name
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- a_single_1a_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 1c2_catalog_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - b_single_1b_network
- - 4p_nested
- - 1c1_scalling_instance_network
- - nodeGetAttIn_network
- - dependsOn_network
- - nestedNoUnified
- - nested_network
- - jsa_security_group
- - a_single_1a_network
- - 1c2_catalog_instance_network
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- BE_Affinity_group:
- type: tosca.groups.Root
- members:
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- outputs:
- out2:
- value:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- out3:
- value:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- out4:
- value:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- out5:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- out1:
- value:
- get_attribute:
- - nestedNoUnified
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- out6:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- policies:
- BE_Affinity_policy:
- type: org.openecomp.policies.placement.Colocate
- properties:
- name: def
- affinity: host
- targets:
- - BE_Affinity_group
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + ppds_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name + type: string + a_single_1a_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names + type: string + pcm_server_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names + type: string + pcm_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name + type: string + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name + type: string + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + entry_schema: + type: string + 1c2_catalog_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names + type: string + pcm_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name + type: string + b_single_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names + type: string + 1c1_scalling_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names + type: string + myIPs: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs + type: string + net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name + type: string + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name + type: string + node_templates: + abstract_b_single_1b: + type: org.openecomp.resource.abstract.nodes.b_single_1b + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + compute_b_single_1b_metadata: + - connectivityTo4PNested: + get_attribute: + - 4p_nested + - server_pcm_id + connectivityTo1C2_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + connectivityToNoUnifiedNested: + get_attribute: + - nestedNoUnified + - portId + connectivityTo1C1_T1_1: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_0: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t1_port_tenant_id + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 0 + service_template_filter: + substitute_service_template: Nested_b_single_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + abstract_1c1_scalling_instance: + type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance + directives: + - substitutable + properties: + compute_1c1_scalling_instance_user_data_format: + - RAW2 + - RAW1 + port_1c1_t2_port_subinterface_indicator: + - true + - true + port_1c1_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_t1_port_name: + - 1c1_t1_port_1 + - 1c1_t1_port_0 + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + port_1c1_t2_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_network: + - get_input: ppds_net_name + - get_input: ppds_net_name + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c1_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c1_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c1_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t2_port_name: + - 1c1_t2_port_1 + - 1c1_t2_port_0 + compute_1c1_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + compute_1c1_scalling_instance_metadata: + - null + - connectivityTo4PNested: + get_attribute: + - 4p_nested + - server_pcm_id + connectivityTo1C2_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1A: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityTo1C2_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + connectivityToNoUnifiedNested: + get_attribute: + - nestedNoUnified + - portId + connectivityTo1B02: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + port_1c1_t1_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c1_scalling_instance_1c1_t1_port: + capability: tosca.capabilities.network.Linkable + node: 1c1_scalling_instance_network + relationship: tosca.relationships.network.LinksTo + b_single_1b_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 4p_nested: + type: org.openecomp.resource.abstract.nodes.heat.pcm_server + directives: + - substitutable + properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + server_group: BE_Affinity_group + connectivityChk: + connectivityTo1C2_1: + get_attribute: + - 1c201_catalog_instance_1C2 + - instance_name + connectivityTo1C2_2: + get_attribute: + - 1c202_scalling_instance_1C2 + - instance_name + connectivityTo1A: + get_attribute: + - 1a_single_1A + - instance_name + connectivityTo1B02: + get_attribute: + - 1b02_single_1B + - instance_name + - get_attribute: + - 1b01_single_1B + - instance_name + connectivityTo1B01: + get_attribute: + - 1b01_single_1B + - instance_name + connectivityTo1C1_T2_1: + get_attribute: + - 1c1_t2_port_1 + - tenant_id + connectivityTo1C1_T2_0: + get_attribute: + - 1c1_t2_port_0 + - tenant_id + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false + 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 + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + 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: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam + requirements: + - link_pcm_port_00: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_0: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_metadata: + - connectivityTo4PNested: + get_attribute: + - 4p_nested + - server_pcm_id + connectivityTo1A: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityToNoUnifiedNested: + get_attribute: + - nestedNoUnified + - portId + connectivityTo1B02: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1C1_T2_1: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + connectivityTo1C1_T2_0: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 1 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_1: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 2 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + 1c1_scalling_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + nodeGetAttIn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + dhcp_agent_ids: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + tenant_id: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + admin_state_up: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + qos_policy: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + network_name: + get_attribute: + - nestedNoUnified + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + value_specs: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + dependsOn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: nestedNoUnified + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 4p_nested + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance_1c1_t2_port + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a_1a_t1_port + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + abstract_a_single_1a: + type: org.openecomp.resource.abstract.nodes.a_single_1a + directives: + - substitutable + properties: + compute_a_single_1a_metadata: + - connectivityTo4PNested: + get_attribute: + - 4p_nested + - server_pcm_id + connectivityTo1C2_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + connectivityToNoUnifiedNested: + get_attribute: + - nestedNoUnified + - portId + connectivityTo1B02: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1C1_T2_1: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + connectivityTo1C1_T2_0: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + port_1a_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1a_t2_port_network: + - get_input: ppds_net_name + port_1a_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + vm_image_name: + get_input: pd_image_name + port_1a_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group + port_1a_t2_port_subinterface_indicator: + - true + port_1a_t1_port_subinterface_indicator: + - true + compute_a_single_1a_user_data_format: + - RAW + compute_a_single_1a_name: + - get_input: + - a_single_1a_names + - 0 + port_1a_t2_port_mac_requirements: + mac_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_a_single_1aServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_a_single_1a_1a_t1_port: + capability: tosca.capabilities.network.Linkable + node: a_single_1a_network + relationship: tosca.relationships.network.LinksTo + nestedNoUnified: + type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml + server_group: BE_Affinity_group + connectivityChk: + connectivityTo1C2_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + connectivityTo1A: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityTo1B02: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1C1_T2_1: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + connectivityTo1C1_T2_0: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_2: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + nested_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + get_input: security_group_name + description: ems security group + rules: + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pcm_port_00 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_01 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_0 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_2 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_3 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + abstract_b_single_1b_1: + type: org.openecomp.resource.abstract.nodes.b_single_1b_1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + port_1b_t1_port_network_role_tag: oam + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + port_1b_t1_port_network: + - get_input: oam_net_name + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + a_single_1a_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 1c2_catalog_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - b_single_1b_network + - 4p_nested + - 1c1_scalling_instance_network + - nodeGetAttIn_network + - dependsOn_network + - nestedNoUnified + - nested_network + - jsa_security_group + - a_single_1a_network + - 1c2_catalog_instance_network + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + outputs: + out2: + value: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + out3: + value: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + out4: + value: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + out5: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + out1: + value: + get_attribute: + - nestedNoUnified + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + out6: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 32b40f3146..2149ee469a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -132,6 +137,11 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -139,26 +149,30 @@ topology_template: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t1_port_mac_requirements + order: + get_input: port_1c1_t1_port_order exCP_naming: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: port_1c1_t1_port_network_role_tag - mac_requirements: - get_input: port_1c1_t1_port_mac_requirements - order: - get_input: port_1c1_t1_port_order network_role: get_input: port_1c1_t1_port_network_role - subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: - port_1c1_t1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t1_port_subnetpoolid name: get_input: - port_1c1_t1_port_name @@ -202,26 +216,30 @@ topology_template: 1c1_scalling_instance_1c1_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t2_port_mac_requirements + order: + get_input: port_1c1_t2_port_order exCP_naming: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: get_input: port_1c1_t2_port_network_role_tag - mac_requirements: - get_input: port_1c1_t2_port_mac_requirements - order: - get_input: port_1c1_t2_port_order network_role: get_input: port_1c1_t2_port_network_role - subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: - port_1c1_t2_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t2_port_subnetpoolid name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 5b89bed0a4..c47e4d5767 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -53,6 +58,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -150,6 +160,10 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index e3b7ea00c8..42c86b84bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -88,9 +88,19 @@ topology_template: port_1a_t1_port_order: type: integer required: true + port_1a_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_1a_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -123,6 +133,10 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml index 222d1f8f1a..85437cb4cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -145,6 +155,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -173,6 +187,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index 5443e13fdf..d41833ab63 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -150,6 +160,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml index b287b62a17..45191338e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -101,6 +106,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -166,6 +176,10 @@ topology_template: pcma_server_pcm_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_3_mac_requirements + order: + get_input: port_pcm_port_3_order security_groups: get_input: - port_pcm_port_3_security_groups @@ -174,22 +188,22 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: get_input: port_pcm_port_3_network_role_tag - mac_requirements: - get_input: port_pcm_port_3_mac_requirements - order: - get_input: port_pcm_port_3_order network_role: get_input: port_pcm_port_3_network_role - subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid fixed_ips: get_input: - port_pcm_port_3_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_3_subnetpoolid network: get_input: - port_pcm_port_3_network @@ -202,6 +216,10 @@ topology_template: pcma_server_pcm_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_2_mac_requirements + order: + get_input: port_pcm_port_2_order security_groups: get_input: - port_pcm_port_2_security_groups @@ -210,22 +228,22 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: get_input: port_pcm_port_2_network_role_tag - mac_requirements: - get_input: port_pcm_port_2_mac_requirements - order: - get_input: port_pcm_port_2_order network_role: get_input: port_pcm_port_2_network_role - subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid fixed_ips: get_input: - port_pcm_port_2_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_2_subnetpoolid network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index 7cc130e234..7a3ec20712 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_0_network_role: type: string required: true + port_pcm_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -64,6 +69,11 @@ topology_template: port_pcm_port_1_network_role: type: string required: true + port_pcm_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -157,6 +167,10 @@ topology_template: pcma_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_0_mac_requirements + order: + get_input: port_pcm_port_0_order security_groups: get_input: - port_pcm_port_0_security_groups @@ -165,22 +179,22 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - mac_requirements: - get_input: port_pcm_port_0_mac_requirements - order: - get_input: port_pcm_port_0_order network_role: get_input: port_pcm_port_0_network_role - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid fixed_ips: get_input: - port_pcm_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid network: get_input: - port_pcm_port_0_network @@ -193,6 +207,10 @@ topology_template: pcma_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_1_mac_requirements + order: + get_input: port_pcm_port_1_order security_groups: get_input: - port_pcm_port_1_security_groups @@ -201,22 +219,22 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - mac_requirements: - get_input: port_pcm_port_1_mac_requirements - order: - get_input: port_pcm_port_1_order network_role: get_input: port_pcm_port_1_network_role - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid fixed_ips: get_input: - port_pcm_port_1_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index c6ff74820a..8f8d2f7a73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -112,6 +112,8 @@ topology_template: directives: - substitutable properties: + port_pcm_port_0_subinterface_indicator: + - true port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -125,6 +127,8 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps + port_pcm_port_1_subinterface_indicator: + - true port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -187,6 +191,8 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip + port_pcm_port_2_subinterface_indicator: + - true vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -219,6 +225,8 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW + port_pcm_port_3_subinterface_indicator: + - true port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index c8969c3372..0708c661c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -384,6 +384,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -554,6 +555,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -776,6 +778,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -936,6 +939,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -956,6 +960,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1054,6 +1064,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -1240,6 +1256,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1289,6 +1306,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1829,6 +1847,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1836,6 +1855,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2110,6 +2130,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2150,6 +2176,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2315,6 +2347,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2374,6 +2407,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2658,6 +2692,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2722,6 +2762,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -2988,6 +3034,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3006,6 +3053,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3229,6 +3277,64 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1b_t1_port_order: + type: integer + required: true + status: SUPPORTED + port_1b_t1_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_order: + type: integer + required: true + status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1b_t2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3253,10 +3359,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_order: - type: integer - required: true - status: SUPPORTED port_1b_t2_port_vlan_requirements: type: list required: true @@ -3269,29 +3371,13 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: boolean + port_1b_t1_port_network_role_tag: type: string required: true status: SUPPORTED @@ -3309,44 +3395,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer - required: true - status: SUPPORTED port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_b_single_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED attributes: b_single_1b_instance_name: type: string @@ -3566,6 +3626,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3698,6 +3759,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3797,6 +3859,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3925,6 +3993,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4127,6 +4201,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4182,6 +4257,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4453,10 +4529,22 @@ node_types: type: integer required: true status: SUPPORTED + port_1a_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_1a_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -4714,6 +4802,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4873,6 +4962,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4955,6 +5045,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5009,6 +5105,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -5264,6 +5366,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5396,6 +5499,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index ee110eb739..6986a6a3bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -1,1104 +1,1130 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- ppds_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ppds_net_name
- type: string
- a_single_1a_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: a_single_1a_names
- type: string
- pcm_server_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_server_names
- type: string
- pcm_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_image_name
- type: string
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: security_group_name
- type: string
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- entry_schema:
- type: string
- 1c2_catalog_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c2_catalog_instance_names
- type: string
- pcm_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_flavor_name
- type: string
- b_single_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: b_single_1b_names
- type: string
- 1c1_scalling_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c1_scalling_instance_names
- type: string
- myIPs:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: myIPs
- type: string
- net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: net_name
- type: string
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: oam_net_name
- type: string
- node_templates:
- nestedNoNestedSingleComputePattern:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
- directives:
- - substitutable
- properties:
- pcm_flavor_name:
- get_input: pcm_flavor_name
- service_template_filter:
- substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml
- server_group: BE_Affinity_group
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_2_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- - link_pcm_port_0_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- abstract_b_single_1b:
- type: org.openecomp.resource.abstract.nodes.b_single_1b
- directives:
- - substitutable
- properties:
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- compute_b_single_1b_user_data_format:
- - RAW
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_b_single_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c1_scalling_instance:
- type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance
- directives:
- - substitutable
- properties:
- compute_1c1_scalling_instance_user_data_format:
- - RAW2
- - RAW1
- port_1c1_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_1c1_scalling_instance_name:
- - get_input:
- - 1c1_scalling_instance_names
- - 2
- - get_input:
- - 1c1_scalling_instance_names
- - 1
- port_1c1_t1_port_name:
- - 1c1_t1_port_1
- - 1c1_t1_port_0
- port_1c1_t1_port_network:
- - 1c1_scalling_instance_network
- - 1c1_scalling_instance_network
- port_1c1_t2_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_network:
- - get_input: ppds_net_name
- - get_input: ppds_net_name
- port_1c1_t1_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c1_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c1_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c1_scalling_instance_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- port_1c1_t2_port_name:
- - 1c1_t2_port_1
- - 1c1_t2_port_0
- compute_1c1_scalling_instance_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c1_scalling_instance_1c1_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c1_scalling_instance_network
- relationship: tosca.relationships.network.LinksTo
- b_single_1b_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- nestedWithNoNovaHadDependencyToIt:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested-no-novaServiceTemplate.yaml
- security_group_name: group1
- net_name: myNetwork
- 4p_nested:
- type: org.openecomp.resource.abstract.nodes.heat.pcm_server
- directives:
- - substitutable
- properties:
- server_group: BE_Affinity_group
- port_pcm_port_1_network_role_tag: oam
- port_pcm_port_0_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- port_pcm_port_1_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:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pcm_port_0_network_role_tag: cps
- port_pcm_port_0_mac_requirements:
- mac_count_required:
- is_required: false
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_0:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 1
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - RAW1
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_1:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 2
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- nestedWithNoNova:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested-no-novaServiceTemplate.yaml
- security_group_name: group1
- net_name: myNetwork
- 1c1_scalling_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- nodeGetAttIn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_agent_ids:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- tenant_id:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- admin_state_up:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- qos_policy:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- network_name:
- get_attribute:
- - nestedNoNestedSingleComputePattern
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- value_specs:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- dependsOn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedNoNestedSingleComputePattern
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 4p_nested
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance_1c1_t2_port
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a_1a_t1_port
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedWithNoNovaHadDependencyToIt
- relationship: tosca.relationships.DependsOn
- abstract_a_single_1a:
- type: org.openecomp.resource.abstract.nodes.a_single_1a
- directives:
- - substitutable
- properties:
- port_1a_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1a_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1a_t2_port_network:
- - get_input: ppds_net_name
- port_1a_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1a_t1_port_network:
- - a_single_1a_network
- vm_image_name:
- get_input: pd_image_name
- port_1a_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_a_single_1a_availability_zone:
- - get_input: availabilityzone_name
- compute_a_single_1a_scheduler_hints:
- - group: BE_Affinity_group
- compute_a_single_1a_user_data_format:
- - RAW
- compute_a_single_1a_name:
- - get_input:
- - a_single_1a_names
- - 0
- port_1a_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_a_single_1a_1a_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: a_single_1a_network
- relationship: tosca.relationships.network.LinksTo
- nested_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- jsa_security_group:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- get_input: security_group_name
- description: ems security group
- rules:
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: egress
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: ingress
- requirements:
- - port:
- capability: attachment_pcm_port_0
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_0_0
- node: nestedNoNestedSingleComputePattern
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_3_0
- node: nestedNoNestedSingleComputePattern
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_2_0
- node: nestedNoNestedSingleComputePattern
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1_0
- node: nestedNoNestedSingleComputePattern
- relationship: org.openecomp.relationships.AttachesTo
- abstract_b_single_1b_1:
- type: org.openecomp.resource.abstract.nodes.b_single_1b_1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1b_t1_port_network_role_tag: oam
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- port_1b_t1_port_network:
- - get_input: oam_net_name
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- a_single_1a_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 1c2_catalog_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - nestedNoNestedSingleComputePattern
- - b_single_1b_network
- - nestedWithNoNovaHadDependencyToIt
- - 4p_nested
- - nestedWithNoNova
- - 1c1_scalling_instance_network
- - nodeGetAttIn_network
- - dependsOn_network
- - nested_network
- - jsa_security_group
- - a_single_1a_network
- - 1c2_catalog_instance_network
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- BE_Affinity_group:
- type: tosca.groups.Root
- members:
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- outputs:
- out2:
- value:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- out3:
- value:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- out4:
- value:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- out5:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- out1:
- value:
- get_attribute:
- - nestedNoNestedSingleComputePattern
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- out6:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- out7:
- value:
- get_attribute:
- - nestedWithNoNovaHadDependencyToIt
- - output1
- policies:
- BE_Affinity_policy:
- type: org.openecomp.policies.placement.Colocate
- properties:
- name: def
- affinity: host
- targets:
- - BE_Affinity_group
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + ppds_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name + type: string + a_single_1a_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names + type: string + pcm_server_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names + type: string + pcm_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name + type: string + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name + type: string + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + entry_schema: + type: string + 1c2_catalog_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names + type: string + pcm_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name + type: string + b_single_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names + type: string + 1c1_scalling_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names + type: string + myIPs: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs + type: string + net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name + type: string + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name + type: string + node_templates: + nestedNoNestedSingleComputePattern: + type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml + server_group: BE_Affinity_group + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_2_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + - link_pcm_port_0_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + abstract_b_single_1b: + type: org.openecomp.resource.abstract.nodes.b_single_1b + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 0 + service_template_filter: + substitute_service_template: Nested_b_single_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + abstract_1c1_scalling_instance: + type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance + directives: + - substitutable + properties: + compute_1c1_scalling_instance_user_data_format: + - RAW2 + - RAW1 + port_1c1_t2_port_subinterface_indicator: + - true + - true + port_1c1_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_t1_port_name: + - 1c1_t1_port_1 + - 1c1_t1_port_0 + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + port_1c1_t2_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_network: + - get_input: ppds_net_name + - get_input: ppds_net_name + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c1_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c1_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c1_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t2_port_name: + - 1c1_t2_port_1 + - 1c1_t2_port_0 + compute_1c1_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + port_1c1_t1_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c1_scalling_instance_1c1_t1_port: + capability: tosca.capabilities.network.Linkable + node: 1c1_scalling_instance_network + relationship: tosca.relationships.network.LinksTo + b_single_1b_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + nestedWithNoNovaHadDependencyToIt: + type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested-no-novaServiceTemplate.yaml + security_group_name: group1 + net_name: myNetwork + 4p_nested: + type: org.openecomp.resource.abstract.nodes.heat.pcm_server + directives: + - substitutable + properties: + server_group: BE_Affinity_group + port_pcm_port_1_network_role_tag: oam + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + port_pcm_port_1_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: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_0: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 1 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_1: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 2 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + nestedWithNoNova: + type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested-no-novaServiceTemplate.yaml + security_group_name: group1 + net_name: myNetwork + 1c1_scalling_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + nodeGetAttIn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + dhcp_agent_ids: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + tenant_id: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + admin_state_up: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + qos_policy: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + network_name: + get_attribute: + - nestedNoNestedSingleComputePattern + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + value_specs: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + dependsOn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: nestedNoNestedSingleComputePattern + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 4p_nested + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance_1c1_t2_port + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a_1a_t1_port + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: nestedWithNoNovaHadDependencyToIt + relationship: tosca.relationships.DependsOn + abstract_a_single_1a: + type: org.openecomp.resource.abstract.nodes.a_single_1a + directives: + - substitutable + properties: + port_1a_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1a_t2_port_network: + - get_input: ppds_net_name + port_1a_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + vm_image_name: + get_input: pd_image_name + port_1a_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group + port_1a_t2_port_subinterface_indicator: + - true + port_1a_t1_port_subinterface_indicator: + - true + compute_a_single_1a_user_data_format: + - RAW + compute_a_single_1a_name: + - get_input: + - a_single_1a_names + - 0 + port_1a_t2_port_mac_requirements: + mac_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_a_single_1aServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_a_single_1a_1a_t1_port: + capability: tosca.capabilities.network.Linkable + node: a_single_1a_network + relationship: tosca.relationships.network.LinksTo + nested_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + get_input: security_group_name + description: ems security group + rules: + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pcm_port_0 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_0_0 + node: nestedNoNestedSingleComputePattern + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_3_0 + node: nestedNoNestedSingleComputePattern + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_2_0 + node: nestedNoNestedSingleComputePattern + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1_0 + node: nestedNoNestedSingleComputePattern + relationship: org.openecomp.relationships.AttachesTo + abstract_b_single_1b_1: + type: org.openecomp.resource.abstract.nodes.b_single_1b_1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_network_role_tag: oam + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + port_1b_t1_port_network: + - get_input: oam_net_name + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + a_single_1a_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 1c2_catalog_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - nestedNoNestedSingleComputePattern + - b_single_1b_network + - nestedWithNoNovaHadDependencyToIt + - 4p_nested + - nestedWithNoNova + - 1c1_scalling_instance_network + - nodeGetAttIn_network + - dependsOn_network + - nested_network + - jsa_security_group + - a_single_1a_network + - 1c2_catalog_instance_network + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + outputs: + out2: + value: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + out3: + value: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + out4: + value: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + out5: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + out1: + value: + get_attribute: + - nestedNoNestedSingleComputePattern + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + out6: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + out7: + value: + get_attribute: + - nestedWithNoNovaHadDependencyToIt + - output1 + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 048b1411a8..f52324068f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -127,6 +132,11 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -134,26 +144,30 @@ topology_template: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t1_port_mac_requirements + order: + get_input: port_1c1_t1_port_order exCP_naming: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: port_1c1_t1_port_network_role_tag - mac_requirements: - get_input: port_1c1_t1_port_mac_requirements - order: - get_input: port_1c1_t1_port_order network_role: get_input: port_1c1_t1_port_network_role - subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: - port_1c1_t1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t1_port_subnetpoolid name: get_input: - port_1c1_t1_port_name @@ -193,26 +207,30 @@ topology_template: 1c1_scalling_instance_1c1_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t2_port_mac_requirements + order: + get_input: port_1c1_t2_port_order exCP_naming: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: get_input: port_1c1_t2_port_network_role_tag - mac_requirements: - get_input: port_1c1_t2_port_mac_requirements - order: - get_input: port_1c1_t2_port_order network_role: get_input: port_1c1_t2_port_network_role - subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: - port_1c1_t2_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t2_port_subnetpoolid name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 84648e4a89..30ca14f281 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -53,6 +58,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -141,6 +151,10 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml index c175da1795..c72b1eb54c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml @@ -83,9 +83,19 @@ topology_template: port_1a_t1_port_order: type: integer required: true + port_1a_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_1a_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -118,6 +128,10 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml index dd68f12949..3ba6c8079f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,6 +11,51 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1b_t1_port_order: + type: integer + required: true + port_1b_t1_port_network_role: + type: string + required: true + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: + type: string + required: true + port_1b_t2_port_network_role: + type: string + required: true + port_1b_t2_port_order: + type: integer + required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1b_t2_port_network_role_tag: + type: string + required: true + port_1b_t2_port_subnetpoolid: + type: string + required: true port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -31,9 +76,6 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_order: - type: integer - required: true port_1b_t2_port_vlan_requirements: type: list required: true @@ -44,24 +86,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: - type: string - required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_flavor_name: - type: string - required: true - port_1b_t1_port_network_role_tag: - type: string - required: true - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: boolean + port_1b_t1_port_network_role_tag: type: string required: true port_1b_t1_port_subnetpoolid: @@ -75,36 +105,16 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: - type: list - required: true - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_b_single_1b_name: type: list required: true entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string - required: true node_templates: b_single_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b @@ -136,6 +146,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -164,6 +178,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml index 60dd00b7a3..06e90acd93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -141,6 +151,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index b287b62a17..45191338e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -101,6 +106,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -166,6 +176,10 @@ topology_template: pcma_server_pcm_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_3_mac_requirements + order: + get_input: port_pcm_port_3_order security_groups: get_input: - port_pcm_port_3_security_groups @@ -174,22 +188,22 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: get_input: port_pcm_port_3_network_role_tag - mac_requirements: - get_input: port_pcm_port_3_mac_requirements - order: - get_input: port_pcm_port_3_order network_role: get_input: port_pcm_port_3_network_role - subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid fixed_ips: get_input: - port_pcm_port_3_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_3_subnetpoolid network: get_input: - port_pcm_port_3_network @@ -202,6 +216,10 @@ topology_template: pcma_server_pcm_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_2_mac_requirements + order: + get_input: port_pcm_port_2_order security_groups: get_input: - port_pcm_port_2_security_groups @@ -210,22 +228,22 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: get_input: port_pcm_port_2_network_role_tag - mac_requirements: - get_input: port_pcm_port_2_mac_requirements - order: - get_input: port_pcm_port_2_order network_role: get_input: port_pcm_port_2_network_role - subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid fixed_ips: get_input: - port_pcm_port_2_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_2_subnetpoolid network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index c38b966352..9dd220a0a1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_0_network_role: type: string required: true + port_pcm_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -64,6 +69,11 @@ topology_template: port_pcm_port_1_network_role: type: string required: true + port_pcm_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -157,6 +167,10 @@ topology_template: pcma_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_0_mac_requirements + order: + get_input: port_pcm_port_0_order security_groups: get_input: - port_pcm_port_0_security_groups @@ -165,22 +179,22 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - mac_requirements: - get_input: port_pcm_port_0_mac_requirements - order: - get_input: port_pcm_port_0_order network_role: get_input: port_pcm_port_0_network_role - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid fixed_ips: get_input: - port_pcm_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid network: get_input: - port_pcm_port_0_network @@ -193,6 +207,10 @@ topology_template: pcma_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_1_mac_requirements + order: + get_input: port_pcm_port_1_order security_groups: get_input: - port_pcm_port_1_security_groups @@ -201,22 +219,22 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - mac_requirements: - get_input: port_pcm_port_1_mac_requirements - order: - get_input: port_pcm_port_1_order network_role: get_input: port_pcm_port_1_network_role - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid fixed_ips: get_input: - port_pcm_port_1_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 0c6ec3a2fd..5edb6aa10d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -108,6 +108,8 @@ topology_template: directives: - substitutable properties: + port_pcm_port_0_subinterface_indicator: + - true port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -121,6 +123,8 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps + port_pcm_port_1_subinterface_indicator: + - true port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_1_security_groups: @@ -183,6 +187,8 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip + port_pcm_port_2_subinterface_indicator: + - true vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -215,6 +221,8 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW + port_pcm_port_3_subinterface_indicator: + - true port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: 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 72198664c2..565834cea3 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 @@ -305,6 +305,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -354,6 +355,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -361,6 +363,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -368,6 +371,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -956,6 +960,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1054,6 +1064,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -1240,6 +1256,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1289,6 +1306,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1984,6 +2002,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1997,6 +2016,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2110,6 +2130,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2150,6 +2176,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2315,6 +2347,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2374,6 +2407,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2658,6 +2692,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2722,6 +2762,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -2988,6 +3034,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3006,6 +3053,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3229,6 +3277,64 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_1b_t1_port_order: + type: integer + required: true + status: SUPPORTED + port_1b_t1_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_order: + type: integer + required: true + status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_1b_t2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3253,10 +3359,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_1b_t1_port_order: - type: integer - required: true - status: SUPPORTED port_1b_t2_port_vlan_requirements: type: list required: true @@ -3269,29 +3371,13 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: boolean + port_1b_t1_port_network_role_tag: type: string required: true status: SUPPORTED @@ -3309,44 +3395,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer - required: true - status: SUPPORTED port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_b_single_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED attributes: b_single_1b_instance_name: type: string @@ -3566,6 +3626,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3698,6 +3759,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3797,6 +3859,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3925,6 +3993,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4127,6 +4201,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4182,6 +4257,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4453,10 +4529,22 @@ node_types: type: integer required: true status: SUPPORTED + port_1a_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_1a_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -4714,6 +4802,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4873,6 +4962,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4955,6 +5045,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5009,6 +5105,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -5264,6 +5366,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5396,6 +5499,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED 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 f4cf709b24..2b81be456f 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 @@ -1,1075 +1,1101 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- ppds_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ppds_net_name
- type: string
- a_single_1a_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: a_single_1a_names
- type: string
- pcm_server_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_server_names
- type: string
- pcm_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_image_name
- type: string
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: security_group_name
- type: string
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- entry_schema:
- type: string
- 1c2_catalog_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c2_catalog_instance_names
- type: string
- pcm_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_flavor_name
- type: string
- b_single_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: b_single_1b_names
- type: string
- 1c1_scalling_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c1_scalling_instance_names
- type: string
- myIPs:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: myIPs
- type: string
- net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: net_name
- type: string
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: oam_net_name
- type: string
- node_templates:
- abstract_b_single_1b:
- type: org.openecomp.resource.abstract.nodes.b_single_1b
- directives:
- - substitutable
- properties:
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- compute_b_single_1b_user_data_format:
- - RAW
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_b_single_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c1_scalling_instance:
- type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance
- directives:
- - substitutable
- properties:
- compute_1c1_scalling_instance_user_data_format:
- - RAW2
- - RAW1
- port_1c1_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_1c1_scalling_instance_name:
- - get_input:
- - 1c1_scalling_instance_names
- - 2
- - get_input:
- - 1c1_scalling_instance_names
- - 1
- port_1c1_t1_port_name:
- - 1c1_t1_port_1
- - 1c1_t1_port_0
- port_1c1_t1_port_network:
- - 1c1_scalling_instance_network
- - 1c1_scalling_instance_network
- port_1c1_t2_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_network:
- - get_input: ppds_net_name
- - get_input: ppds_net_name
- port_1c1_t1_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t2_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c1_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c1_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c1_scalling_instance_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- port_1c1_t2_port_name:
- - 1c1_t2_port_1
- - 1c1_t2_port_0
- compute_1c1_scalling_instance_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c1_scalling_instance_1c1_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c1_scalling_instance_network
- relationship: tosca.relationships.network.LinksTo
- b_single_1b_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 4p_nested:
- type: org.openecomp.resource.abstract.nodes.heat.pcm_server
- directives:
- - substitutable
- properties:
- port_pcm_port_00_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- server_group: BE_Affinity_group
- pcm_image_name:
- get_input: pcm_image_name
- port_pcm_port_00_mac_requirements:
- mac_count_required:
- is_required: false
- 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
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- 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:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- port_pcm_port_01_network_role_tag: oam
- requirements:
- - link_pcm_port_00:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_0:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 1
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - RAW1
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_1:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- vm_image_name:
- get_input: pd_image_name
- port_1c2_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c2_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c2_t2_port_network:
- - 1c2_catalog_instance_network
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 2
- port_1c2_t1_port_network:
- - get_input: oam_net_name
- port_1c2_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag: oam
- port_1c2_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_1c2_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- 1c1_scalling_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- nodeGetAttIn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_agent_ids:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- tenant_id:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- admin_state_up:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- qos_policy:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- network_name:
- get_attribute:
- - nestedNoUnified
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- value_specs:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- dependsOn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedNoUnified
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 4p_nested
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c2_t1_port
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c1_scalling_instance_1c1_t2_port
- node: abstract_1c1_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a_1a_t1_port
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- abstract_a_single_1a:
- type: org.openecomp.resource.abstract.nodes.a_single_1a
- directives:
- - substitutable
- properties:
- port_1a_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1a_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1a_t2_port_network:
- - get_input: ppds_net_name
- port_1a_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1a_t1_port_network:
- - a_single_1a_network
- vm_image_name:
- get_input: pd_image_name
- port_1a_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_a_single_1a_availability_zone:
- - get_input: availabilityzone_name
- compute_a_single_1a_scheduler_hints:
- - group: BE_Affinity_group
- compute_a_single_1a_user_data_format:
- - RAW
- compute_a_single_1a_name:
- - get_input:
- - a_single_1a_names
- - 0
- port_1a_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_a_single_1a_1a_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: a_single_1a_network
- relationship: tosca.relationships.network.LinksTo
- nestedNoUnified:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
- directives:
- - substitutable
- properties:
- pcm_flavor_name:
- get_input: pcm_flavor_name
- service_template_filter:
- substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml
- server_group: BE_Affinity_group
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_2:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- - link_pcm_port_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- nested_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- jsa_security_group:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- get_input: security_group_name
- description: ems security group
- rules:
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: egress
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: ingress
- requirements:
- - port:
- capability: attachment_pcm_port_00
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_01
- node: 4p_nested
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_0
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_2
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_3
- node: nestedNoUnified
- relationship: org.openecomp.relationships.AttachesTo
- abstract_b_single_1b_1:
- type: org.openecomp.resource.abstract.nodes.b_single_1b_1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1b_t1_port_network_role_tag: oam
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network
- port_1b_t1_port_network:
- - get_input: oam_net_name
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network
- relationship: tosca.relationships.network.LinksTo
- a_single_1a_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 1c2_catalog_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - b_single_1b_network
- - 4p_nested
- - 1c1_scalling_instance_network
- - nodeGetAttIn_network
- - dependsOn_network
- - nestedNoUnified
- - nested_network
- - jsa_security_group
- - a_single_1a_network
- - 1c2_catalog_instance_network
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- BE_Affinity_group:
- type: tosca.groups.Root
- members:
- - abstract_a_single_1a
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_1c1_scalling_instance
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- outputs:
- out2:
- value:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c2_t1_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- out3:
- value:
- get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- - get_attribute:
- - abstract_1c1_scalling_instance
- - 1c1_scalling_instance_1c1_t2_port_tenant_id
- out4:
- value:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- out5:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- out1:
- value:
- get_attribute:
- - nestedNoUnified
- - portId
- - get_attribute:
- - 4p_nested
- - server_pcm_id
- out6:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- policies:
- BE_Affinity_policy:
- type: org.openecomp.policies.placement.Colocate
- properties:
- name: def
- affinity: host
- targets:
- - BE_Affinity_group
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + ppds_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name + type: string + a_single_1a_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names + type: string + pcm_server_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names + type: string + pcm_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name + type: string + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name + type: string + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + entry_schema: + type: string + 1c2_catalog_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names + type: string + pcm_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name + type: string + b_single_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names + type: string + 1c1_scalling_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c1_scalling_instance_names + type: string + myIPs: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs + type: string + net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name + type: string + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name + type: string + node_templates: + abstract_b_single_1b: + type: org.openecomp.resource.abstract.nodes.b_single_1b + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 0 + service_template_filter: + substitute_service_template: Nested_b_single_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + abstract_1c1_scalling_instance: + type: org.openecomp.resource.abstract.nodes.1c1_scalling_instance + directives: + - substitutable + properties: + compute_1c1_scalling_instance_user_data_format: + - RAW2 + - RAW1 + port_1c1_t2_port_subinterface_indicator: + - true + - true + port_1c1_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_1c1_scalling_instance_name: + - get_input: + - 1c1_scalling_instance_names + - 2 + - get_input: + - 1c1_scalling_instance_names + - 1 + port_1c1_t1_port_name: + - 1c1_t1_port_1 + - 1c1_t1_port_0 + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + port_1c1_t2_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_network: + - get_input: ppds_net_name + - get_input: ppds_net_name + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t2_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c1_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c1_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c1_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t2_port_name: + - 1c1_t2_port_1 + - 1c1_t2_port_0 + compute_1c1_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + port_1c1_t1_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c1_scalling_instance_1c1_t1_port: + capability: tosca.capabilities.network.Linkable + node: 1c1_scalling_instance_network + relationship: tosca.relationships.network.LinksTo + b_single_1b_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 4p_nested: + type: org.openecomp.resource.abstract.nodes.heat.pcm_server + directives: + - substitutable + properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + server_group: BE_Affinity_group + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false + 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 + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + 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: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam + requirements: + - link_pcm_port_00: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_0: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 1 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_1: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + port_1c2_t1_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + vm_image_name: + get_input: pd_image_name + port_1c2_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c2_t2_port_subinterface_indicator: + - true + port_1c2_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1c2_t2_port_network: + - 1c2_catalog_instance_network + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 2 + port_1c2_t1_port_network: + - get_input: oam_net_name + port_1c2_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c2_t1_port_network_role_tag: oam + port_1c2_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_1c2_t2_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + 1c1_scalling_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + nodeGetAttIn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + dhcp_agent_ids: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + tenant_id: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + admin_state_up: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + qos_policy: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + network_name: + get_attribute: + - nestedNoUnified + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + value_specs: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + dependsOn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: nestedNoUnified + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 4p_nested + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c2_t1_port + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c1_scalling_instance_1c1_t2_port + node: abstract_1c1_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a_1a_t1_port + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + abstract_a_single_1a: + type: org.openecomp.resource.abstract.nodes.a_single_1a + directives: + - substitutable + properties: + port_1a_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1a_t2_port_network: + - get_input: ppds_net_name + port_1a_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + vm_image_name: + get_input: pd_image_name + port_1a_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group + port_1a_t2_port_subinterface_indicator: + - true + port_1a_t1_port_subinterface_indicator: + - true + compute_a_single_1a_user_data_format: + - RAW + compute_a_single_1a_name: + - get_input: + - a_single_1a_names + - 0 + port_1a_t2_port_mac_requirements: + mac_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_a_single_1aServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_a_single_1a_1a_t1_port: + capability: tosca.capabilities.network.Linkable + node: a_single_1a_network + relationship: tosca.relationships.network.LinksTo + nestedNoUnified: + type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml + server_group: BE_Affinity_group + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_2: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + nested_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + get_input: security_group_name + description: ems security group + rules: + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pcm_port_00 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_01 + node: 4p_nested + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_0 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_2 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_3 + node: nestedNoUnified + relationship: org.openecomp.relationships.AttachesTo + abstract_b_single_1b_1: + type: org.openecomp.resource.abstract.nodes.b_single_1b_1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_network_role_tag: oam + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network + port_1b_t1_port_network: + - get_input: oam_net_name + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network + relationship: tosca.relationships.network.LinksTo + a_single_1a_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 1c2_catalog_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - b_single_1b_network + - 4p_nested + - 1c1_scalling_instance_network + - nodeGetAttIn_network + - dependsOn_network + - nestedNoUnified + - nested_network + - jsa_security_group + - a_single_1a_network + - 1c2_catalog_instance_network + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_a_single_1a + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_1c1_scalling_instance + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + outputs: + out2: + value: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c2_t1_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + out3: + value: + get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_instance_name + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + - get_attribute: + - abstract_1c1_scalling_instance + - 1c1_scalling_instance_1c1_t2_port_tenant_id + out4: + value: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + out5: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + out1: + value: + get_attribute: + - nestedNoUnified + - portId + - get_attribute: + - 4p_nested + - server_pcm_id + out6: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index 048b1411a8..f52324068f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: string + port_1c1_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -127,6 +132,11 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t1_port_order: type: integer required: true @@ -134,26 +144,30 @@ topology_template: 1c1_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t1_port_mac_requirements + order: + get_input: port_1c1_t1_port_order exCP_naming: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: port_1c1_t1_port_network_role_tag - mac_requirements: - get_input: port_1c1_t1_port_mac_requirements - order: - get_input: port_1c1_t1_port_order network_role: get_input: port_1c1_t1_port_network_role - subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: - port_1c1_t1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t1_port_subnetpoolid name: get_input: - port_1c1_t1_port_name @@ -193,26 +207,30 @@ topology_template: 1c1_scalling_instance_1c1_t2_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t2_port_mac_requirements + order: + get_input: port_1c1_t2_port_order exCP_naming: get_input: port_1c1_t2_port_exCP_naming vlan_requirements: get_input: port_1c1_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t2_port_ip_requirements network_role_tag: get_input: port_1c1_t2_port_network_role_tag - mac_requirements: - get_input: port_1c1_t2_port_mac_requirements - order: - get_input: port_1c1_t2_port_order network_role: get_input: port_1c1_t2_port_network_role - subnetpoolid: - get_input: port_1c1_t2_port_subnetpoolid fixed_ips: get_input: - port_1c1_t2_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t2_port_subnetpoolid name: get_input: - port_1c1_t2_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 84648e4a89..30ca14f281 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true + port_1c2_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -53,6 +58,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -141,6 +151,10 @@ topology_template: get_input: port_1c2_t2_port_exCP_naming vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1c2_t1_port_exCP_naming vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c2_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml index c175da1795..c72b1eb54c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml @@ -83,9 +83,19 @@ topology_template: port_1a_t1_port_order: type: integer required: true + port_1a_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_1a_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -118,6 +128,10 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml index dd68f12949..3ba6c8079f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml @@ -11,6 +11,51 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_1b_t1_port_order: + type: integer + required: true + port_1b_t1_port_network_role: + type: string + required: true + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_1b_t1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: + type: string + required: true + port_1b_t2_port_network_role: + type: string + required: true + port_1b_t2_port_order: + type: integer + required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + compute_b_single_1b_user_data_format: + type: list + required: true + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_1b_t2_port_network_role_tag: + type: string + required: true + port_1b_t2_port_subnetpoolid: + type: string + required: true port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -31,9 +76,6 @@ topology_template: required: true entry_schema: type: json - port_1b_t1_port_order: - type: integer - required: true port_1b_t2_port_vlan_requirements: type: list required: true @@ -44,24 +86,12 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_network_role: - type: string - required: true - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - vm_flavor_name: - type: string - required: true - port_1b_t1_port_network_role_tag: - type: string - required: true - port_1b_t1_port_ip_requirements: + port_1b_t1_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: + type: boolean + port_1b_t1_port_network_role_tag: type: string required: true port_1b_t1_port_subnetpoolid: @@ -75,36 +105,16 @@ topology_template: required: true entry_schema: type: string - port_1b_t2_port_network_role: - type: string - required: true - port_1b_t2_port_order: - type: integer - required: true port_1b_t1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_b_single_1b_user_data_format: - type: list - required: true - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_b_single_1b_name: type: list required: true entry_schema: type: string - port_1b_t2_port_network_role_tag: - type: string - required: true - port_1b_t2_port_subnetpoolid: - type: string - required: true node_templates: b_single_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b @@ -136,6 +146,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -164,6 +178,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml index 60dd00b7a3..06e90acd93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -141,6 +151,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: 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_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml index b287b62a17..45191338e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -101,6 +106,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -166,6 +176,10 @@ topology_template: pcma_server_pcm_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_3_mac_requirements + order: + get_input: port_pcm_port_3_order security_groups: get_input: - port_pcm_port_3_security_groups @@ -174,22 +188,22 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: get_input: port_pcm_port_3_network_role_tag - mac_requirements: - get_input: port_pcm_port_3_mac_requirements - order: - get_input: port_pcm_port_3_order network_role: get_input: port_pcm_port_3_network_role - subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid fixed_ips: get_input: - port_pcm_port_3_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_3_subnetpoolid network: get_input: - port_pcm_port_3_network @@ -202,6 +216,10 @@ topology_template: pcma_server_pcm_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_2_mac_requirements + order: + get_input: port_pcm_port_2_order security_groups: get_input: - port_pcm_port_2_security_groups @@ -210,22 +228,22 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: get_input: port_pcm_port_2_network_role_tag - mac_requirements: - get_input: port_pcm_port_2_mac_requirements - order: - get_input: port_pcm_port_2_order network_role: get_input: port_pcm_port_2_network_role - subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid fixed_ips: get_input: - port_pcm_port_2_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_2_subnetpoolid network: get_input: - port_pcm_port_2_network 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_pcma_server_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_pcma_server_1ServiceTemplate.yaml index 7cc130e234..7a3ec20712 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_0_network_role: type: string required: true + port_pcm_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -64,6 +69,11 @@ topology_template: port_pcm_port_1_network_role: type: string required: true + port_pcm_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -157,6 +167,10 @@ topology_template: pcma_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_0_mac_requirements + order: + get_input: port_pcm_port_0_order security_groups: get_input: - port_pcm_port_0_security_groups @@ -165,22 +179,22 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - mac_requirements: - get_input: port_pcm_port_0_mac_requirements - order: - get_input: port_pcm_port_0_order network_role: get_input: port_pcm_port_0_network_role - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid fixed_ips: get_input: - port_pcm_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid network: get_input: - port_pcm_port_0_network @@ -193,6 +207,10 @@ topology_template: pcma_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_1_mac_requirements + order: + get_input: port_pcm_port_1_order security_groups: get_input: - port_pcm_port_1_security_groups @@ -201,22 +219,22 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - mac_requirements: - get_input: port_pcm_port_1_mac_requirements - order: - get_input: port_pcm_port_1_order network_role: get_input: port_pcm_port_1_network_role - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid fixed_ips: get_input: - port_pcm_port_1_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid network: get_input: - port_pcm_port_1_network 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-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index bbc0a64921..422dcdb061 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -108,6 +108,8 @@ topology_template: directives: - substitutable properties: + port_pcm_port_0_subinterface_indicator: + - true port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -121,6 +123,8 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps + port_pcm_port_1_subinterface_indicator: + - true port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -183,6 +187,8 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip + port_pcm_port_2_subinterface_indicator: + - true vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -215,6 +221,8 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW + port_pcm_port_3_subinterface_indicator: + - true port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0c12ab2a37..646e484720 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -309,6 +309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -358,6 +359,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -365,6 +367,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -372,6 +375,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1030,6 +1034,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t1_port_network: type: list required: true @@ -1176,6 +1186,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1856,6 +1867,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1869,6 +1881,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2052,6 +2065,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c1_t1_port_network: type: list required: true @@ -2300,6 +2319,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2427,6 +2447,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -2525,6 +2551,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -2711,6 +2743,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2760,6 +2793,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3459,6 +3493,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3472,6 +3507,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3577,6 +3613,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_2c202_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c201_port_vlan_requirements: type: list required: true @@ -3673,6 +3715,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c201_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3846,6 +3894,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4058,6 +4107,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4126,6 +4176,12 @@ node_types: org.openecomp.resource.abstract.nodes.1c2_catalog_instance: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_2c202_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -4222,6 +4278,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c201_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -4356,6 +4418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4473,6 +4536,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4766,6 +4830,12 @@ node_types: type: string required: true status: SUPPORTED + port_1a_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t1_port_vlan_requirements: type: list required: true @@ -5066,6 +5136,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5130,6 +5201,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -5194,6 +5271,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -5460,6 +5543,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5478,6 +5562,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5735,6 +5820,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5789,6 +5880,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -6050,6 +6147,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6182,6 +6280,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6361,10 +6460,22 @@ node_types: type: integer required: true status: SUPPORTED + port_1a_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_1a_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -6622,6 +6733,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6781,6 +6893,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6863,6 +6976,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -6917,6 +7036,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -7172,6 +7297,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7304,6 +7430,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7427,6 +7554,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -7475,6 +7608,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -7743,6 +7882,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7850,6 +7990,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7994,6 +8135,12 @@ node_types: type: integer required: true status: SUPPORTED + port_1b_t2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -8042,6 +8189,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1b_t1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_b_single_2b_user_data_format: type: list required: true @@ -8298,6 +8451,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8405,6 +8559,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index f27ed2c5fb..eda8f53329 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -1,2288 +1,2332 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- ppds_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ppds_net_name
- type: string
- a_single_1a_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: a_single_1a_names
- type: string
- a_single_2a_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: a_single_2a_names
- type: string
- 2c2_catalog_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 2c2_catalog_instance_names
- type: string
- pcm_server_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_server_names
- type: string
- pcm_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_image_name
- type: string
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: security_group_name
- type: string
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- entry_schema:
- type: string
- 1c2_catalog_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c2_catalog_instance_names
- type: string
- pcm_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pcm_flavor_name
- type: string
- b_single_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: b_single_1b_names
- type: string
- 1c12_scalling_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c12_scalling_instance_names
- type: string
- b_single_2b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: b_single_2b_names
- type: string
- myIPs:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: myIPs
- type: string
- net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: net_name
- type: string
- 1c11_scalling_instance_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: 1c11_scalling_instance_names
- type: string
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: oam_net_name
- type: string
- node_templates:
- abstract_b_single_1b:
- type: org.openecomp.resource.abstract.nodes.b_single_1b
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1b_t1_port_value_specs:
- - get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- port_1b_t1_port_network_role_tag: oam
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network_1
- port_1b_t1_port_network:
- - get_input: oam_net_name
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_b_single_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network_1
- relationship: tosca.relationships.network.LinksTo
- abstract_2c2_catalog_instance_0:
- type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_2c2_catalog_instance_user_data_format:
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- vm_flavor_name:
- get_input: pd_flavor_name
- port_2c202_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c201_port_network_role_tag: oam
- compute_2c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- compute_2c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- compute_2c2_catalog_instance_name:
- - get_input:
- - 2c2_catalog_instance_names
- - 1
- port_2c202_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_2c202_port_network:
- - 1c2_catalog_instance_network
- port_1c201_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c201_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c201_port_network:
- - get_input: oam_net_name
- service_template_filter:
- substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_2c2_catalog_instance_2c202_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_2c2_catalog_instance_1:
- type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_2c2_catalog_instance_user_data_format:
- - RAW1
- vm_flavor_name:
- get_input: pd_flavor_name
- port_2c202_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c201_port_network_role_tag: oam
- compute_2c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- compute_2c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- compute_2c2_catalog_instance_name:
- - get_input:
- - 2c2_catalog_instance_names
- - 0
- port_2c202_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_2c202_port_network:
- - 1c2_catalog_instance_network
- port_1c201_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c201_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1c201_port_network:
- - get_input: oam_net_name
- service_template_filter:
- substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_2c2_catalog_instance_2c202_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_0:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- compute_1c2_catalog_instance_personality:
- - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name]
- port_2c202_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c201_port_network_role_tag: oam
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 1
- port_2c202_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_2c202_port_network:
- - 1c2_catalog_instance_network
- port_1c201_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c201_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - RAW1
- port_1c201_port_network:
- - get_input: oam_net_name
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_2c202_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c2_catalog_instance_1:
- type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
- directives:
- - substitutable
- properties:
- compute_1c2_catalog_instance_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- port_2c202_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c201_port_network_role_tag: oam
- compute_1c2_catalog_instance_name:
- - get_input:
- - 1c2_catalog_instance_names
- - 2
- port_2c202_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_2c202_port_network:
- - 1c2_catalog_instance_network
- port_1c201_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1c201_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_1c2_catalog_instance_user_data_format:
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- port_1c201_port_network:
- - get_input: oam_net_name
- compute_1c2_catalog_instance_scheduler_hints:
- - group: BE_Affinity_group
- service_template_filter:
- substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c2_catalog_instance_2c202_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c2_catalog_instance_network
- relationship: tosca.relationships.network.LinksTo
- nodeGetAttIn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_agent_ids:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c201_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c201_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- tenant_id:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_instance_name
- - get_attribute:
- - 1c1_t2_port_02
- - tenant_id
- - get_attribute:
- - 1c1_t2_port_11
- - tenant_id
- - get_attribute:
- - 1c1_t2_port_12
- - tenant_id
- - get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_instance_name
- admin_state_up:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- qos_policy:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- network_name:
- get_attribute:
- - nestedNoUnified_1
- - portId
- - get_attribute:
- - 4p_nested_2
- - server_pcm_id
- value_specs:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- abstract_a_single_1a:
- type: org.openecomp.resource.abstract.nodes.a_single_1a
- directives:
- - substitutable
- properties:
- compute_a_single_1a_metadata:
- - connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1A:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1C1_T2_01:
- get_attribute:
- - 1c1_t2_port_01
- - tenant_id
- connectivityTo1C1_T2_12:
- get_attribute:
- - 1c1_t2_port_12
- - tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T2_02:
- get_attribute:
- - 1c1_t2_port_02
- - tenant_id
- connectivityTo1C1_T2_11:
- get_attribute:
- - 1c1_t2_port_11
- - tenant_id
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- port_1a_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_1a_t2_port_network_role_tag: ppds
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1a_t2_port_network:
- - get_input: ppds_net_name
- port_1a_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1a_t1_port_network:
- - a_single_1a_network
- vm_image_name:
- get_input: pd_image_name
- port_1a_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_a_single_1a_availability_zone:
- - get_input: availabilityzone_name
- compute_a_single_1a_scheduler_hints:
- - group: BE_Affinity_group
- compute_a_single_1a_user_data_format:
- - RAW
- compute_a_single_1a_name:
- - get_input:
- - a_single_1a_names
- - 0
- port_1a_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_a_single_1aServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_a_single_1a_1a_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: a_single_1a_network
- relationship: tosca.relationships.network.LinksTo
- nestedNoUnified_1:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
- directives:
- - substitutable
- properties:
- pcm_flavor_name:
- get_input: pcm_flavor_name
- service_template_filter:
- substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1C1_T1_02:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1B01_1:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B02_1:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1B01_2:
- get_attribute:
- - abstract_b_single_2b_1
- - b_single_2b_instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityTo1A_2:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- connectivityTo1B02_2:
- get_attribute:
- - abstract_b_single_2b
- - b_single_2b_instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityTo1A_1:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_2:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- - link_pcm_port_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- nestedNoUnified_2:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1
- directives:
- - substitutable
- properties:
- pcm_flavor_name:
- get_input: pcm_flavor_name
- service_template_filter:
- substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1C1_T1_02:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1B01_1:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B02_1:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1B01_2:
- get_attribute:
- - abstract_b_single_2b_1
- - b_single_2b_instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityTo1A_2:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- connectivityTo1B02_2:
- get_attribute:
- - abstract_b_single_2b
- - b_single_2b_instance_name
- connectivityTo1A_1:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- pcm_image_name:
- get_input: pcm_image_name
- security_group_name: jsa_security_group
- pcm_server_name:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- requirements:
- - link_pcm_port_2:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- - link_pcm_port_0:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- abstract_1c11_scalling_instance:
- type: org.openecomp.resource.abstract.nodes.1c11_scalling_instance
- directives:
- - substitutable
- properties:
- port_1c1_t1_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- port_1c1_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_flavor_name
- compute_1c11_scalling_instance_name:
- - get_input:
- - 1c11_scalling_instance_names
- - 1
- - get_input:
- - 1c11_scalling_instance_names
- - 2
- compute_1c11_scalling_instance_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_1c11_scalling_instance_user_data_format:
- - RAW1
- - RAW1
- port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c1_t1_port_name:
- - 1c1_t1_port_01
- - 1c1_t1_port_02
- compute_1c11_scalling_instance_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- port_1c1_t1_port_network:
- - 1c1_scalling_instance_network
- - 1c1_scalling_instance_network
- service_template_filter:
- substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c11_scalling_instance_1c1_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c1_scalling_instance_network
- relationship: tosca.relationships.network.LinksTo
- abstract_b_single_2b_1:
- type: org.openecomp.resource.abstract.nodes.b_single_2b_1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- compute_b_single_2b_metadata:
- - connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1C1_T1_02:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1B01_1:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- connectivityTo1B02_1:
- get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityTo1A_2:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityTo1A_1:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_2b_scheduler_hints:
- - group: BE_Affinity_group
- compute_b_single_2b_availability_zone:
- - get_input: availabilityzone_name
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_b_single_2b_name:
- - get_input:
- - b_single_2b_names
- - 0
- compute_b_single_2b_user_data_format:
- - RAW
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network_2
- service_template_filter:
- substitute_service_template: Nested_b_single_2b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_2b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network_2
- relationship: tosca.relationships.network.LinksTo
- b_single_1b_network_1:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- b_single_1b_network_2:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- abstract_1c12_scalling_instance:
- type: org.openecomp.resource.abstract.nodes.1c12_scalling_instance
- directives:
- - substitutable
- properties:
- compute_1c12_scalling_instance_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- port_1c1_t1_port_fixed_ips:
- - - ip_address:
- get_input:
- - myIPs
- - 1
- - - ip_address:
- get_input:
- - myIPs
- - 1
- compute_1c12_scalling_instance_name:
- - get_input:
- - 1c12_scalling_instance_names
- - 1
- - get_input:
- - 1c12_scalling_instance_names
- - 2
- port_1c1_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_flavor_name
- compute_1c12_scalling_instance_user_data_format:
- - RAW1
- - RAW1
- port_1c1_t1_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_1c1_t1_port_name:
- - 1c1_t1_port_11
- - 1c1_t1_port_12
- compute_1c12_scalling_instance_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- port_1c1_t1_port_network:
- - 1c1_scalling_instance_network
- - 1c1_scalling_instance_network
- service_template_filter:
- substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_1c12_scalling_instance_1c1_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: 1c1_scalling_instance_network
- relationship: tosca.relationships.network.LinksTo
- jsa_security_group:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- get_input: security_group_name
- description: ems security group
- rules:
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: egress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: egress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: egress
- - protocol: tcp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv4
- port_range_max: 65535
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- direction: ingress
- - protocol: tcp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: udp
- ethertype: IPv6
- port_range_max: 65535
- remote_ip_prefix: ::/0
- direction: ingress
- port_range_min: 1
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: ingress
- requirements:
- - port:
- capability: attachment_pcm_port_00
- node: 4p_nested_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_01
- node: 4p_nested_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_00
- node: 4p_nested_2
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_01
- node: 4p_nested_2
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_0
- node: nestedNoUnified_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1
- node: nestedNoUnified_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_2
- node: nestedNoUnified_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_3
- node: nestedNoUnified_1
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_0
- node: nestedNoUnified_2
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_1
- node: nestedNoUnified_2
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_2
- node: nestedNoUnified_2
- relationship: org.openecomp.relationships.AttachesTo
- - port:
- capability: attachment_pcm_port_3
- node: nestedNoUnified_2
- relationship: org.openecomp.relationships.AttachesTo
- a_single_1a_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- 1c2_catalog_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- abstract_a_single_2a:
- type: org.openecomp.resource.abstract.nodes.a_single_2a
- directives:
- - substitutable
- properties:
- compute_a_single_2a_user_data_format:
- - RAW
- port_1a_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_a_single_2a_scheduler_hints:
- - group: BE_Affinity_group
- compute_a_single_2a_availability_zone:
- - get_input: availabilityzone_name
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1a_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1a_t1_port_network:
- - a_single_1a_network
- compute_a_single_2a_name:
- - get_input:
- - a_single_2a_names
- - 0
- vm_image_name:
- get_input: pd_image_name
- compute_a_single_2a_metadata:
- - connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1A:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityTo1B02:
- get_attribute:
- - abstract_b_single_2b
- - b_single_2b_instance_name
- - get_attribute:
- - abstract_b_single_2b_1
- - b_single_2b_instance_name
- connectivityTo1B01:
- get_attribute:
- - abstract_b_single_2b_1
- - b_single_2b_instance_name
- connectivityTo1C1_T2_01:
- get_attribute:
- - 1c1_t2_port_01
- - tenant_id
- connectivityTo1C1_T2_12:
- get_attribute:
- - 1c1_t2_port_12
- - tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T2_02:
- get_attribute:
- - 1c1_t2_port_02
- - tenant_id
- connectivityTo1C1_T2_11:
- get_attribute:
- - 1c1_t2_port_11
- - tenant_id
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- service_template_filter:
- substitute_service_template: Nested_a_single_2aServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_a_single_2a_1a_t1_port:
- capability: tosca.capabilities.network.Linkable
- node: a_single_1a_network
- relationship: tosca.relationships.network.LinksTo
- 1c1_t2_port_02:
- type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
- properties:
- ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 1
- mac_requirements:
- mac_count_required:
- is_required: false
- name: 1c1_t2_port_02
- network_role_tag: ppds
- network:
- get_input: ppds_net_name
- 1c1_t2_port_01:
- type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
- properties:
- ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 1
- mac_requirements:
- mac_count_required:
- is_required: false
- name: 1c1_t2_port_01
- network_role_tag: ppds
- network:
- get_input: ppds_net_name
- 1c1_scalling_instance_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- abstract_b_single_2b:
- type: org.openecomp.resource.abstract.nodes.b_single_2b
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_2b_scheduler_hints:
- - group: BE_Affinity_group
- compute_b_single_2b_availability_zone:
- - get_input: availabilityzone_name
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_b_single_2b_name:
- - get_input:
- - b_single_2b_names
- - 1
- port_1b_t1_port_value_specs:
- - get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- compute_b_single_2b_user_data_format:
- - RAW
- port_1b_t1_port_network_role_tag: oam
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network_2
- port_1b_t1_port_network:
- - get_input: oam_net_name
- service_template_filter:
- substitute_service_template: Nested_b_single_2bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_2b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network_2
- relationship: tosca.relationships.network.LinksTo
- dependsOn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedNoUnified_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: nestedNoUnified_2
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 4p_nested_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 4p_nested_2
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c201_port
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance_1c201_port
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_2c2_catalog_instance
- node: abstract_2c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c2_catalog_instance
- node: abstract_1c2_catalog_instance_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_2c2_catalog_instance
- node: abstract_2c2_catalog_instance_0
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c11_scalling_instance
- node: abstract_1c11_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_1c12_scalling_instance
- node: abstract_1c12_scalling_instance
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 1c1_t2_port_02
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: 1c1_t2_port_12
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b_1
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_b_single_1b_1b_t1_port
- node: abstract_b_single_1b
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_2a
- node: abstract_a_single_2a
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: feature_a_single_1a_1a_t1_port
- node: abstract_a_single_1a
- relationship: tosca.relationships.DependsOn
- 4p_nested_2:
- type: org.openecomp.resource.abstract.nodes.heat.pcm_server
- directives:
- - substitutable
- properties:
- port_pcm_port_00_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo1C1_T1_02:
- get_attribute:
- - 1c1_t1_port_02
- - tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - 1c1_t1_port_11
- - tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - 1c1_t1_port_01
- - tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - 1c1_t1_port_12
- - tenant_id
- connectivityTo1B01_1:
- get_attribute:
- - 1b01_single_1B_1
- - instance_name
- connectivityTo1B02_1:
- get_attribute:
- - 1b02_single_1B_1
- - instance_name
- connectivityTo1B01_2:
- get_attribute:
- - 1b01_single_1B_2
- - instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - 2c202_catalog_instance_1C22
- - instance_name
- connectivityTo1A_2:
- get_attribute:
- - 2a_single_1A_2
- - instance_name
- connectivityTo1B02_2:
- get_attribute:
- - 1b02_single_1B_2
- - instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityTo1A_1:
- get_attribute:
- - 1a_single_1A_1
- - instance_name
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - 1c201_catalog_instance_1C21
- - instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - 2c202_catalog_instance_1C21
- - instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - 1c201_catalog_instance_1C22
- - instance_name
- pcm_image_name:
- get_input: pcm_image_name
- port_pcm_port_00_mac_requirements:
- mac_count_required:
- is_required: false
- 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
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- 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:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- port_pcm_port_01_network_role_tag: oam
- requirements:
- - link_pcm_port_00:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- 1c1_t2_port_12:
- type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
- properties:
- ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 1
- mac_requirements:
- mac_count_required:
- is_required: false
- name: 1c1_t2_port_12
- network_role_tag: ppds
- network:
- get_input: ppds_net_name
- 4p_nested_1:
- type: org.openecomp.resource.abstract.nodes.heat.pcm_server
- directives:
- - substitutable
- properties:
- port_pcm_port_00_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- server_group: BE_Affinity_group
- connectivityChk:
- connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1C1_T1_02:
- get_attribute:
- - 1c1_t1_port_02
- - tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - 1c1_t1_port_11
- - tenant_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - 1c1_t1_port_01
- - tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - 1c1_t1_port_12
- - tenant_id
- connectivityTo1B01_1:
- get_attribute:
- - 1b01_single_1B_1
- - instance_name
- connectivityTo1B02_1:
- get_attribute:
- - 1b02_single_1B_1
- - instance_name
- connectivityTo1B01_2:
- get_attribute:
- - 1b01_single_1B_2
- - instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - 2c202_catalog_instance_1C22
- - instance_name
- connectivityTo1A_2:
- get_attribute:
- - 2a_single_1A_2
- - instance_name
- connectivityTo1B02_2:
- get_attribute:
- - 1b02_single_1B_2
- - instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityTo1A_1:
- get_attribute:
- - 1a_single_1A_1
- - instance_name
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - 1c201_catalog_instance_1C21
- - instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - 2c202_catalog_instance_1C21
- - instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - 1c201_catalog_instance_1C22
- - instance_name
- pcm_image_name:
- get_input: pcm_image_name
- port_pcm_port_00_mac_requirements:
- mac_count_required:
- is_required: false
- 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
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- 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:
- get_input:
- - pcm_server_names
- - 0
- cps_net_name: nested_network
- port_pcm_port_01_network_role_tag: oam
- requirements:
- - link_pcm_port_00:
- capability: tosca.capabilities.network.Linkable
- node: nested_network
- relationship: tosca.relationships.network.LinksTo
- 1c1_t2_port_11:
- type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
- properties:
- ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 1
- mac_requirements:
- mac_count_required:
- is_required: false
- name: 1c1_t2_port_11
- network_role_tag: ppds
- network:
- get_input: ppds_net_name
- nested_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: net_name
- abstract_b_single_1b_1:
- type: org.openecomp.resource.abstract.nodes.b_single_1b_1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: pd_flavor_name
- port_1b_t1_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- compute_b_single_1b_user_data_format:
- - RAW
- port_1b_t2_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_b_single_1b_availability_zone:
- - get_input: availabilityzone_name
- compute_b_single_1b_scheduler_hints:
- - group: BE_Affinity_group
- port_1b_t2_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_b_single_1b_metadata:
- - connectivityTo4PNested_2:
- get_attribute:
- - 4p_nested_2
- - server_pcm_id
- connectivityTo1C1_T1_02:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_11:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo4PNested_1:
- get_attribute:
- - 4p_nested_1
- - server_pcm_id
- connectivityTo1C1_T1_01:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1C1_T1_12:
- get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_1c1_t1_port_tenant_id
- connectivityTo1B01_2:
- get_attribute:
- - abstract_b_single_2b_1
- - b_single_2b_instance_name
- connectivityTo1C2_2_2:
- get_attribute:
- - abstract_2c2_catalog_instance_0
- - 2c2_catalog_instance_instance_name
- connectivityTo1A_2:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- connectivityTo1B02_2:
- get_attribute:
- - abstract_b_single_2b
- - b_single_2b_instance_name
- connectivityToNoUnifiedNested_2:
- get_attribute:
- - nestedNoUnified_2
- - portId
- connectivityTo1A_1:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- connectivityToNoUnifiedNested_1:
- get_attribute:
- - nestedNoUnified_1
- - portId
- connectivityTo1C2_1_1:
- get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_instance_name
- connectivityTo1C2_2_1:
- get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- connectivityTo1C2_1_2:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- port_1b_t1_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_1b_t2_port_network:
- - b_single_1b_network_1
- compute_b_single_1b_name:
- - get_input:
- - b_single_1b_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_b_single_1b_1b_t2_port:
- capability: tosca.capabilities.network.Linkable
- node: b_single_1b_network_1
- relationship: tosca.relationships.network.LinksTo
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - nodeGetAttIn_network
- - nestedNoUnified_1
- - nestedNoUnified_2
- - b_single_1b_network_1
- - b_single_1b_network_2
- - jsa_security_group
- - a_single_1a_network
- - 1c2_catalog_instance_network
- - 1c1_t2_port_02
- - 1c1_t2_port_01
- - 1c1_scalling_instance_network
- - dependsOn_network
- - 4p_nested_2
- - 1c1_t2_port_12
- - 4p_nested_1
- - 1c1_t2_port_11
- - nested_network
- - abstract_a_single_2a
- - abstract_a_single_1a
- - abstract_1c11_scalling_instance
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_b_single_2b
- - abstract_b_single_2b_1
- - abstract_1c12_scalling_instance
- - abstract_2c2_catalog_instance_0
- - abstract_2c2_catalog_instance_1
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- BE_Affinity_group:
- type: tosca.groups.Root
- members:
- - abstract_a_single_2a
- - abstract_a_single_1a
- - abstract_1c11_scalling_instance
- - abstract_b_single_1b
- - abstract_b_single_1b_1
- - abstract_b_single_2b
- - abstract_b_single_2b_1
- - abstract_1c12_scalling_instance
- - abstract_2c2_catalog_instance_0
- - abstract_2c2_catalog_instance_1
- - abstract_1c2_catalog_instance_0
- - abstract_1c2_catalog_instance_1
- outputs:
- out2:
- value:
- get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_1c201_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_0
- - 1c2_catalog_instance_1c201_port_tenant_id
- - get_attribute:
- - abstract_1c2_catalog_instance_1
- - 1c2_catalog_instance_instance_name
- - get_attribute:
- - abstract_2c2_catalog_instance_1
- - 2c2_catalog_instance_instance_name
- out3:
- value:
- get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_instance_name
- - get_attribute:
- - abstract_1c11_scalling_instance
- - 1c11_scalling_instance_instance_name
- - get_attribute:
- - 1c1_t2_port_02
- - tenant_id
- - get_attribute:
- - 1c1_t2_port_11
- - tenant_id
- - get_attribute:
- - 1c1_t2_port_12
- - tenant_id
- - get_attribute:
- - abstract_1c12_scalling_instance
- - 1c12_scalling_instance_instance_name
- out4:
- value:
- get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_instance_name
- - get_attribute:
- - abstract_b_single_1b_1
- - b_single_1b_1b_t1_port_tenant_id
- - get_attribute:
- - abstract_b_single_1b
- - b_single_1b_1b_t1_port_tenant_id
- out5:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_instance_name
- out1:
- value:
- get_attribute:
- - nestedNoUnified_1
- - portId
- - get_attribute:
- - 4p_nested_2
- - server_pcm_id
- out6:
- value:
- get_attribute:
- - abstract_a_single_1a
- - a_single_1a_1a_t1_port_tenant_id
- out7:
- value:
- get_attribute:
- - abstract_a_single_2a
- - a_single_2a_instance_name
- policies:
- BE_Affinity_policy:
- type: org.openecomp.policies.placement.Colocate
- properties:
- name: def
- affinity: host
- targets:
- - BE_Affinity_group
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + ppds_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ppds_net_name + type: string + a_single_1a_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_1a_names + type: string + a_single_2a_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: a_single_2a_names + type: string + 2c2_catalog_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 2c2_catalog_instance_names + type: string + pcm_server_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_server_names + type: string + pcm_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_image_name + type: string + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: security_group_name + type: string + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + entry_schema: + type: string + 1c2_catalog_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c2_catalog_instance_names + type: string + pcm_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pcm_flavor_name + type: string + b_single_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_1b_names + type: string + 1c12_scalling_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c12_scalling_instance_names + type: string + b_single_2b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: b_single_2b_names + type: string + myIPs: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: myIPs + type: string + net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: net_name + type: string + 1c11_scalling_instance_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: 1c11_scalling_instance_names + type: string + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: oam_net_name + type: string + node_templates: + abstract_b_single_1b: + type: org.openecomp.resource.abstract.nodes.b_single_1b + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + port_1b_t1_port_network_role_tag: oam + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network_1 + port_1b_t1_port_network: + - get_input: oam_net_name + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_b_single_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network_1 + relationship: tosca.relationships.network.LinksTo + abstract_2c2_catalog_instance_0: + type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance + directives: + - substitutable + properties: + compute_2c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + port_2c202_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + port_2c202_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c201_port_network_role_tag: oam + compute_2c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + compute_2c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 1 + port_2c202_port_mac_requirements: + mac_count_required: + is_required: false + port_2c202_port_network: + - 1c2_catalog_instance_network + port_1c201_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c201_port_subinterface_indicator: + - true + port_1c201_port_mac_requirements: + mac_count_required: + is_required: false + port_1c201_port_network: + - get_input: oam_net_name + service_template_filter: + substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_2c2_catalog_instance_2c202_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_2c2_catalog_instance_1: + type: org.openecomp.resource.abstract.nodes.2c2_catalog_instance + directives: + - substitutable + properties: + compute_2c2_catalog_instance_user_data_format: + - RAW1 + port_2c202_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: pd_flavor_name + port_2c202_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c201_port_network_role_tag: oam + compute_2c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + compute_2c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + compute_2c2_catalog_instance_name: + - get_input: + - 2c2_catalog_instance_names + - 0 + port_2c202_port_mac_requirements: + mac_count_required: + is_required: false + port_2c202_port_network: + - 1c2_catalog_instance_network + port_1c201_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c201_port_subinterface_indicator: + - true + port_1c201_port_mac_requirements: + mac_count_required: + is_required: false + port_1c201_port_network: + - get_input: oam_net_name + service_template_filter: + substitute_service_template: Nested_2c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_2c2_catalog_instance_2c202_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_0: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + port_2c202_port_subinterface_indicator: + - true + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + compute_1c2_catalog_instance_personality: + - - UNSUPPORTED_RESOURCE_[1a_single_1A_1, instance_name] + port_2c202_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c201_port_network_role_tag: oam + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 1 + port_2c202_port_mac_requirements: + mac_count_required: + is_required: false + port_2c202_port_network: + - 1c2_catalog_instance_network + port_1c201_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c201_port_subinterface_indicator: + - true + port_1c201_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - RAW1 + port_1c201_port_network: + - get_input: oam_net_name + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_2c202_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_1c2_catalog_instance_1: + type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance + directives: + - substitutable + properties: + port_2c202_port_subinterface_indicator: + - true + compute_1c2_catalog_instance_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + port_2c202_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c201_port_network_role_tag: oam + compute_1c2_catalog_instance_name: + - get_input: + - 1c2_catalog_instance_names + - 2 + port_2c202_port_mac_requirements: + mac_count_required: + is_required: false + port_2c202_port_network: + - 1c2_catalog_instance_network + port_1c201_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1c201_port_subinterface_indicator: + - true + port_1c201_port_mac_requirements: + mac_count_required: + is_required: false + compute_1c2_catalog_instance_user_data_format: + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + port_1c201_port_network: + - get_input: oam_net_name + compute_1c2_catalog_instance_scheduler_hints: + - group: BE_Affinity_group + service_template_filter: + substitute_service_template: Nested_1c2_catalog_instanceServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c2_catalog_instance_2c202_port: + capability: tosca.capabilities.network.Linkable + node: 1c2_catalog_instance_network + relationship: tosca.relationships.network.LinksTo + nodeGetAttIn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + dhcp_agent_ids: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c201_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c201_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + tenant_id: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_instance_name + - get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_instance_name + - get_attribute: + - 1c1_t2_port_02 + - tenant_id + - get_attribute: + - 1c1_t2_port_11 + - tenant_id + - get_attribute: + - 1c1_t2_port_12 + - tenant_id + - get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_instance_name + admin_state_up: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + qos_policy: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + network_name: + get_attribute: + - nestedNoUnified_1 + - portId + - get_attribute: + - 4p_nested_2 + - server_pcm_id + value_specs: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + abstract_a_single_1a: + type: org.openecomp.resource.abstract.nodes.a_single_1a + directives: + - substitutable + properties: + compute_a_single_1a_metadata: + - connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1A: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + connectivityTo1B02: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1C1_T2_01: + get_attribute: + - 1c1_t2_port_01 + - tenant_id + connectivityTo1C1_T2_12: + get_attribute: + - 1c1_t2_port_12 + - tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T2_02: + get_attribute: + - 1c1_t2_port_02 + - tenant_id + connectivityTo1C1_T2_11: + get_attribute: + - 1c1_t2_port_11 + - tenant_id + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + port_1a_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1a_t2_port_network_role_tag: ppds + vm_flavor_name: + get_input: pd_flavor_name + port_1a_t2_port_network: + - get_input: ppds_net_name + port_1a_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + vm_image_name: + get_input: pd_image_name + port_1a_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_a_single_1a_availability_zone: + - get_input: availabilityzone_name + compute_a_single_1a_scheduler_hints: + - group: BE_Affinity_group + port_1a_t2_port_subinterface_indicator: + - true + port_1a_t1_port_subinterface_indicator: + - true + compute_a_single_1a_user_data_format: + - RAW + compute_a_single_1a_name: + - get_input: + - a_single_1a_names + - 0 + port_1a_t2_port_mac_requirements: + mac_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_a_single_1aServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_a_single_1a_1a_t1_port: + capability: tosca.capabilities.network.Linkable + node: a_single_1a_network + relationship: tosca.relationships.network.LinksTo + nestedNoUnified_1: + type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml + server_group: BE_Affinity_group + connectivityChk: + connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1C1_T1_02: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T1_01: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1B01_1: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B02_1: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1B01_2: + get_attribute: + - abstract_b_single_2b_1 + - b_single_2b_instance_name + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityTo1A_2: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + connectivityTo1B02_2: + get_attribute: + - abstract_b_single_2b + - b_single_2b_instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityTo1A_1: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_2: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + nestedNoUnified_2: + type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 + directives: + - substitutable + properties: + pcm_flavor_name: + get_input: pcm_flavor_name + service_template_filter: + substitute_service_template: nested-no_vfc_v0.1ServiceTemplate.yaml + server_group: BE_Affinity_group + connectivityChk: + connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1C1_T1_02: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T1_01: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1B01_1: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B02_1: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1B01_2: + get_attribute: + - abstract_b_single_2b_1 + - b_single_2b_instance_name + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityTo1A_2: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + connectivityTo1B02_2: + get_attribute: + - abstract_b_single_2b + - b_single_2b_instance_name + connectivityTo1A_1: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + pcm_image_name: + get_input: pcm_image_name + security_group_name: jsa_security_group + pcm_server_name: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + requirements: + - link_pcm_port_2: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + - link_pcm_port_0: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + abstract_1c11_scalling_instance: + type: org.openecomp.resource.abstract.nodes.1c11_scalling_instance + directives: + - substitutable + properties: + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + port_1c1_t1_port_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_flavor_name + compute_1c11_scalling_instance_name: + - get_input: + - 1c11_scalling_instance_names + - 1 + - get_input: + - 1c11_scalling_instance_names + - 2 + compute_1c11_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_1c11_scalling_instance_user_data_format: + - RAW1 + - RAW1 + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c1_t1_port_name: + - 1c1_t1_port_01 + - 1c1_t1_port_02 + compute_1c11_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + port_1c1_t1_port_subinterface_indicator: + - true + - true + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + service_template_filter: + substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c11_scalling_instance_1c1_t1_port: + capability: tosca.capabilities.network.Linkable + node: 1c1_scalling_instance_network + relationship: tosca.relationships.network.LinksTo + abstract_b_single_2b_1: + type: org.openecomp.resource.abstract.nodes.b_single_2b_1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + compute_b_single_2b_metadata: + - connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1C1_T1_02: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T1_01: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1B01_1: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + connectivityTo1B02_1: + get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityTo1A_2: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityTo1A_1: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_2b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_2b_availability_zone: + - get_input: availabilityzone_name + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 0 + port_1b_t1_port_subinterface_indicator: + - true + compute_b_single_2b_user_data_format: + - RAW + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network_2 + service_template_filter: + substitute_service_template: Nested_b_single_2b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_2b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network_2 + relationship: tosca.relationships.network.LinksTo + b_single_1b_network_1: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + b_single_1b_network_2: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + abstract_1c12_scalling_instance: + type: org.openecomp.resource.abstract.nodes.1c12_scalling_instance + directives: + - substitutable + properties: + compute_1c12_scalling_instance_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + port_1c1_t1_port_fixed_ips: + - - ip_address: + get_input: + - myIPs + - 1 + - - ip_address: + get_input: + - myIPs + - 1 + compute_1c12_scalling_instance_name: + - get_input: + - 1c12_scalling_instance_names + - 1 + - get_input: + - 1c12_scalling_instance_names + - 2 + port_1c1_t1_port_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_flavor_name + compute_1c12_scalling_instance_user_data_format: + - RAW1 + - RAW1 + port_1c1_t1_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1c1_t1_port_name: + - 1c1_t1_port_11 + - 1c1_t1_port_12 + compute_1c12_scalling_instance_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + port_1c1_t1_port_subinterface_indicator: + - true + - true + port_1c1_t1_port_network: + - 1c1_scalling_instance_network + - 1c1_scalling_instance_network + service_template_filter: + substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_1c12_scalling_instance_1c1_t1_port: + capability: tosca.capabilities.network.Linkable + node: 1c1_scalling_instance_network + relationship: tosca.relationships.network.LinksTo + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + get_input: security_group_name + description: ems security group + rules: + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pcm_port_00 + node: 4p_nested_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_01 + node: 4p_nested_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_00 + node: 4p_nested_2 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_01 + node: 4p_nested_2 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_0 + node: nestedNoUnified_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1 + node: nestedNoUnified_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_2 + node: nestedNoUnified_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_3 + node: nestedNoUnified_1 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_0 + node: nestedNoUnified_2 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_1 + node: nestedNoUnified_2 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_2 + node: nestedNoUnified_2 + relationship: org.openecomp.relationships.AttachesTo + - port: + capability: attachment_pcm_port_3 + node: nestedNoUnified_2 + relationship: org.openecomp.relationships.AttachesTo + a_single_1a_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + 1c2_catalog_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + abstract_a_single_2a: + type: org.openecomp.resource.abstract.nodes.a_single_2a + directives: + - substitutable + properties: + compute_a_single_2a_user_data_format: + - RAW + port_1a_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_a_single_2a_scheduler_hints: + - group: BE_Affinity_group + compute_a_single_2a_availability_zone: + - get_input: availabilityzone_name + vm_flavor_name: + get_input: pd_flavor_name + port_1a_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1a_t1_port_network: + - a_single_1a_network + compute_a_single_2a_name: + - get_input: + - a_single_2a_names + - 0 + vm_image_name: + get_input: pd_image_name + port_1a_t1_port_subinterface_indicator: + - true + compute_a_single_2a_metadata: + - connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1A: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityTo1B02: + get_attribute: + - abstract_b_single_2b + - b_single_2b_instance_name + - get_attribute: + - abstract_b_single_2b_1 + - b_single_2b_instance_name + connectivityTo1B01: + get_attribute: + - abstract_b_single_2b_1 + - b_single_2b_instance_name + connectivityTo1C1_T2_01: + get_attribute: + - 1c1_t2_port_01 + - tenant_id + connectivityTo1C1_T2_12: + get_attribute: + - 1c1_t2_port_12 + - tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T2_02: + get_attribute: + - 1c1_t2_port_02 + - tenant_id + connectivityTo1C1_T2_11: + get_attribute: + - 1c1_t2_port_11 + - tenant_id + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + service_template_filter: + substitute_service_template: Nested_a_single_2aServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_a_single_2a_1a_t1_port: + capability: tosca.capabilities.network.Linkable + node: a_single_1a_network + relationship: tosca.relationships.network.LinksTo + 1c1_t2_port_02: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + fixed_ips: + - ip_address: + get_input: + - myIPs + - 1 + mac_requirements: + mac_count_required: + is_required: false + name: 1c1_t2_port_02 + network_role_tag: ppds + network: + get_input: ppds_net_name + 1c1_t2_port_01: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + fixed_ips: + - ip_address: + get_input: + - myIPs + - 1 + mac_requirements: + mac_count_required: + is_required: false + name: 1c1_t2_port_01 + network_role_tag: ppds + network: + get_input: ppds_net_name + 1c1_scalling_instance_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + abstract_b_single_2b: + type: org.openecomp.resource.abstract.nodes.b_single_2b + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + compute_b_single_2b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_2b_availability_zone: + - get_input: availabilityzone_name + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_b_single_2b_name: + - get_input: + - b_single_2b_names + - 1 + port_1b_t1_port_subinterface_indicator: + - true + port_1b_t1_port_value_specs: + - get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + compute_b_single_2b_user_data_format: + - RAW + port_1b_t1_port_network_role_tag: oam + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network_2 + port_1b_t1_port_network: + - get_input: oam_net_name + service_template_filter: + substitute_service_template: Nested_b_single_2bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_2b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network_2 + relationship: tosca.relationships.network.LinksTo + dependsOn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: nestedNoUnified_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: nestedNoUnified_2 + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 4p_nested_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 4p_nested_2 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c201_port + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance_1c201_port + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_2c2_catalog_instance + node: abstract_2c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c2_catalog_instance + node: abstract_1c2_catalog_instance_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_2c2_catalog_instance + node: abstract_2c2_catalog_instance_0 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c11_scalling_instance + node: abstract_1c11_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_1c12_scalling_instance + node: abstract_1c12_scalling_instance + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 1c1_t2_port_02 + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: 1c1_t2_port_12 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b_1 + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_b_single_1b_1b_t1_port + node: abstract_b_single_1b + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_2a + node: abstract_a_single_2a + relationship: tosca.relationships.DependsOn + - dependency: + capability: feature_a_single_1a_1a_t1_port + node: abstract_a_single_1a + relationship: tosca.relationships.DependsOn + 4p_nested_2: + type: org.openecomp.resource.abstract.nodes.heat.pcm_server + directives: + - substitutable + properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + server_group: BE_Affinity_group + connectivityChk: + connectivityTo1C1_T1_02: + get_attribute: + - 1c1_t1_port_02 + - tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - 1c1_t1_port_11 + - tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T1_01: + get_attribute: + - 1c1_t1_port_01 + - tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - 1c1_t1_port_12 + - tenant_id + connectivityTo1B01_1: + get_attribute: + - 1b01_single_1B_1 + - instance_name + connectivityTo1B02_1: + get_attribute: + - 1b02_single_1B_1 + - instance_name + connectivityTo1B01_2: + get_attribute: + - 1b01_single_1B_2 + - instance_name + connectivityTo1C2_2_2: + get_attribute: + - 2c202_catalog_instance_1C22 + - instance_name + connectivityTo1A_2: + get_attribute: + - 2a_single_1A_2 + - instance_name + connectivityTo1B02_2: + get_attribute: + - 1b02_single_1B_2 + - instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityTo1A_1: + get_attribute: + - 1a_single_1A_1 + - instance_name + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - 1c201_catalog_instance_1C21 + - instance_name + connectivityTo1C2_2_1: + get_attribute: + - 2c202_catalog_instance_1C21 + - instance_name + connectivityTo1C2_1_2: + get_attribute: + - 1c201_catalog_instance_1C22 + - instance_name + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false + 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 + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + 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: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam + requirements: + - link_pcm_port_00: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + 1c1_t2_port_12: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + fixed_ips: + - ip_address: + get_input: + - myIPs + - 1 + mac_requirements: + mac_count_required: + is_required: false + name: 1c1_t2_port_12 + network_role_tag: ppds + network: + get_input: ppds_net_name + 4p_nested_1: + type: org.openecomp.resource.abstract.nodes.heat.pcm_server + directives: + - substitutable + properties: + port_pcm_port_00_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + server_group: BE_Affinity_group + connectivityChk: + connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1C1_T1_02: + get_attribute: + - 1c1_t1_port_02 + - tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - 1c1_t1_port_11 + - tenant_id + connectivityTo1C1_T1_01: + get_attribute: + - 1c1_t1_port_01 + - tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - 1c1_t1_port_12 + - tenant_id + connectivityTo1B01_1: + get_attribute: + - 1b01_single_1B_1 + - instance_name + connectivityTo1B02_1: + get_attribute: + - 1b02_single_1B_1 + - instance_name + connectivityTo1B01_2: + get_attribute: + - 1b01_single_1B_2 + - instance_name + connectivityTo1C2_2_2: + get_attribute: + - 2c202_catalog_instance_1C22 + - instance_name + connectivityTo1A_2: + get_attribute: + - 2a_single_1A_2 + - instance_name + connectivityTo1B02_2: + get_attribute: + - 1b02_single_1B_2 + - instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityTo1A_1: + get_attribute: + - 1a_single_1A_1 + - instance_name + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - 1c201_catalog_instance_1C21 + - instance_name + connectivityTo1C2_2_1: + get_attribute: + - 2c202_catalog_instance_1C21 + - instance_name + connectivityTo1C2_1_2: + get_attribute: + - 1c201_catalog_instance_1C22 + - instance_name + pcm_image_name: + get_input: pcm_image_name + port_pcm_port_00_mac_requirements: + mac_count_required: + is_required: false + 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 + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + 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: + get_input: + - pcm_server_names + - 0 + cps_net_name: nested_network + port_pcm_port_01_network_role_tag: oam + requirements: + - link_pcm_port_00: + capability: tosca.capabilities.network.Linkable + node: nested_network + relationship: tosca.relationships.network.LinksTo + 1c1_t2_port_11: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + fixed_ips: + - ip_address: + get_input: + - myIPs + - 1 + mac_requirements: + mac_count_required: + is_required: false + name: 1c1_t2_port_11 + network_role_tag: ppds + network: + get_input: ppds_net_name + nested_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name + abstract_b_single_1b_1: + type: org.openecomp.resource.abstract.nodes.b_single_1b_1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: pd_flavor_name + port_1b_t1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_1b_t2_port_subinterface_indicator: + - true + compute_b_single_1b_user_data_format: + - RAW + port_1b_t2_port_mac_requirements: + mac_count_required: + is_required: false + compute_b_single_1b_availability_zone: + - get_input: availabilityzone_name + compute_b_single_1b_scheduler_hints: + - group: BE_Affinity_group + port_1b_t2_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_1b_t1_port_subinterface_indicator: + - true + compute_b_single_1b_metadata: + - connectivityTo4PNested_2: + get_attribute: + - 4p_nested_2 + - server_pcm_id + connectivityTo1C1_T1_02: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_11: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo4PNested_1: + get_attribute: + - 4p_nested_1 + - server_pcm_id + connectivityTo1C1_T1_01: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1C1_T1_12: + get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_1c1_t1_port_tenant_id + connectivityTo1B01_2: + get_attribute: + - abstract_b_single_2b_1 + - b_single_2b_instance_name + connectivityTo1C2_2_2: + get_attribute: + - abstract_2c2_catalog_instance_0 + - 2c2_catalog_instance_instance_name + connectivityTo1A_2: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + connectivityTo1B02_2: + get_attribute: + - abstract_b_single_2b + - b_single_2b_instance_name + connectivityToNoUnifiedNested_2: + get_attribute: + - nestedNoUnified_2 + - portId + connectivityTo1A_1: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + connectivityToNoUnifiedNested_1: + get_attribute: + - nestedNoUnified_1 + - portId + connectivityTo1C2_1_1: + get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_instance_name + connectivityTo1C2_2_1: + get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + connectivityTo1C2_1_2: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + port_1b_t1_port_mac_requirements: + mac_count_required: + is_required: false + port_1b_t2_port_network: + - b_single_1b_network_1 + compute_b_single_1b_name: + - get_input: + - b_single_1b_names + - 0 + service_template_filter: + substitute_service_template: Nested_b_single_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_b_single_1b_1b_t2_port: + capability: tosca.capabilities.network.Linkable + node: b_single_1b_network_1 + relationship: tosca.relationships.network.LinksTo + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - nodeGetAttIn_network + - nestedNoUnified_1 + - nestedNoUnified_2 + - b_single_1b_network_1 + - b_single_1b_network_2 + - jsa_security_group + - a_single_1a_network + - 1c2_catalog_instance_network + - 1c1_t2_port_02 + - 1c1_t2_port_01 + - 1c1_scalling_instance_network + - dependsOn_network + - 4p_nested_2 + - 1c1_t2_port_12 + - 4p_nested_1 + - 1c1_t2_port_11 + - nested_network + - abstract_a_single_2a + - abstract_a_single_1a + - abstract_1c11_scalling_instance + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_b_single_2b + - abstract_b_single_2b_1 + - abstract_1c12_scalling_instance + - abstract_2c2_catalog_instance_0 + - abstract_2c2_catalog_instance_1 + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_a_single_2a + - abstract_a_single_1a + - abstract_1c11_scalling_instance + - abstract_b_single_1b + - abstract_b_single_1b_1 + - abstract_b_single_2b + - abstract_b_single_2b_1 + - abstract_1c12_scalling_instance + - abstract_2c2_catalog_instance_0 + - abstract_2c2_catalog_instance_1 + - abstract_1c2_catalog_instance_0 + - abstract_1c2_catalog_instance_1 + outputs: + out2: + value: + get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_1c201_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_0 + - 1c2_catalog_instance_1c201_port_tenant_id + - get_attribute: + - abstract_1c2_catalog_instance_1 + - 1c2_catalog_instance_instance_name + - get_attribute: + - abstract_2c2_catalog_instance_1 + - 2c2_catalog_instance_instance_name + out3: + value: + get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_instance_name + - get_attribute: + - abstract_1c11_scalling_instance + - 1c11_scalling_instance_instance_name + - get_attribute: + - 1c1_t2_port_02 + - tenant_id + - get_attribute: + - 1c1_t2_port_11 + - tenant_id + - get_attribute: + - 1c1_t2_port_12 + - tenant_id + - get_attribute: + - abstract_1c12_scalling_instance + - 1c12_scalling_instance_instance_name + out4: + value: + get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b + - b_single_1b_instance_name + - get_attribute: + - abstract_b_single_1b_1 + - b_single_1b_1b_t1_port_tenant_id + - get_attribute: + - abstract_b_single_1b + - b_single_1b_1b_t1_port_tenant_id + out5: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_instance_name + out1: + value: + get_attribute: + - nestedNoUnified_1 + - portId + - get_attribute: + - 4p_nested_2 + - server_pcm_id + out6: + value: + get_attribute: + - abstract_a_single_1a + - a_single_1a_1a_t1_port_tenant_id + out7: + value: + get_attribute: + - abstract_a_single_2a + - a_single_2a_instance_name + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: def + affinity: host + targets: + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml index 988cd5e3b7..59f38d2842 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml @@ -79,6 +79,11 @@ topology_template: port_1c1_t1_port_network_role: type: string required: true + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t1_port_network: type: list required: true @@ -114,26 +119,30 @@ topology_template: 1c11_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t1_port_mac_requirements + order: + get_input: port_1c1_t1_port_order exCP_naming: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: port_1c1_t1_port_network_role_tag - mac_requirements: - get_input: port_1c1_t1_port_mac_requirements - order: - get_input: port_1c1_t1_port_order network_role: get_input: port_1c1_t1_port_network_role - subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: - port_1c1_t1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t1_port_subnetpoolid name: get_input: - port_1c1_t1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml index b371d54354..bec0f575e2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml @@ -79,6 +79,11 @@ topology_template: required: true entry_schema: type: string + port_1c1_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c1_t1_port_network: type: list required: true @@ -91,26 +96,30 @@ topology_template: 1c12_scalling_instance_1c1_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1c1_t1_port_mac_requirements + order: + get_input: port_1c1_t1_port_order exCP_naming: get_input: port_1c1_t1_port_exCP_naming vlan_requirements: get_input: port_1c1_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c1_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c1_t1_port_ip_requirements network_role_tag: get_input: port_1c1_t1_port_network_role_tag - mac_requirements: - get_input: port_1c1_t1_port_mac_requirements - order: - get_input: port_1c1_t1_port_order network_role: get_input: port_1c1_t1_port_network_role - subnetpoolid: - get_input: port_1c1_t1_port_subnetpoolid fixed_ips: get_input: - port_1c1_t1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_1c1_t1_port_subnetpoolid name: get_input: - port_1c1_t1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index d770ab9789..88d3420e9c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_2c202_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_1c2_catalog_instance_availability_zone: type: list required: true @@ -88,6 +93,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c201_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -154,6 +164,10 @@ topology_template: get_input: port_1c201_port_exCP_naming vlan_requirements: get_input: port_1c201_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c201_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c201_port_ip_requirements network_role_tag: @@ -182,6 +196,10 @@ topology_template: get_input: port_2c202_port_exCP_naming vlan_requirements: get_input: port_2c202_port_vlan_requirements + subinterface_indicator: + get_input: + - port_2c202_port_subinterface_indicator + - index_value ip_requirements: get_input: port_2c202_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml index 8c3dc82552..78ef186ce1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + port_2c202_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c201_port_vlan_requirements: type: list required: true @@ -93,6 +98,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c201_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1c201_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -141,6 +151,10 @@ topology_template: get_input: port_2c202_port_exCP_naming vlan_requirements: get_input: port_2c202_port_vlan_requirements + subinterface_indicator: + get_input: + - port_2c202_port_subinterface_indicator + - index_value ip_requirements: get_input: port_2c202_port_ip_requirements network_role_tag: @@ -169,6 +183,10 @@ topology_template: get_input: port_1c201_port_exCP_naming vlan_requirements: get_input: port_1c201_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1c201_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1c201_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml index e3b7ea00c8..42c86b84bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml @@ -88,9 +88,19 @@ topology_template: port_1a_t1_port_order: type: integer required: true + port_1a_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_1a_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -123,6 +133,10 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1a_t2_port_exCP_naming vlan_requirements: get_input: port_1a_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml index 7a8fab1623..c099fc8050 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: vm_image_name: type: string required: true + port_1a_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1a_t1_port_vlan_requirements: type: list required: true @@ -117,6 +122,10 @@ topology_template: get_input: port_1a_t1_port_exCP_naming vlan_requirements: get_input: port_1a_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1a_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml index 4763d46ae3..7c950fb3b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -150,6 +160,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml index fda44d67b1..80e69025cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_network_role_tag: type: string required: true @@ -145,6 +155,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -173,6 +187,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml index 44d41d5090..3bdd28fc08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml @@ -42,6 +42,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -81,6 +86,11 @@ topology_template: required: true entry_schema: type: string + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t1_port_value_specs: type: list required: true @@ -150,6 +160,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml index a78b6fd22e..4b997a780a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml @@ -47,6 +47,11 @@ topology_template: port_1b_t2_port_order: type: integer required: true + port_1b_t2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_1b_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -86,6 +91,11 @@ topology_template: required: true entry_schema: type: string + port_1b_t1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_b_single_2b_user_data_format: type: list required: true @@ -145,6 +155,10 @@ topology_template: get_input: port_1b_t1_port_exCP_naming vlan_requirements: get_input: port_1b_t1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -173,6 +187,10 @@ topology_template: get_input: port_1b_t2_port_exCP_naming vlan_requirements: get_input: port_1b_t2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_1b_t2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml index b287b62a17..45191338e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_2_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_3_network_role: type: string required: true @@ -101,6 +106,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_2_order: type: integer required: true @@ -166,6 +176,10 @@ topology_template: pcma_server_pcm_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_3_mac_requirements + order: + get_input: port_pcm_port_3_order security_groups: get_input: - port_pcm_port_3_security_groups @@ -174,22 +188,22 @@ topology_template: get_input: port_pcm_port_3_exCP_naming vlan_requirements: get_input: port_pcm_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_3_ip_requirements network_role_tag: get_input: port_pcm_port_3_network_role_tag - mac_requirements: - get_input: port_pcm_port_3_mac_requirements - order: - get_input: port_pcm_port_3_order network_role: get_input: port_pcm_port_3_network_role - subnetpoolid: - get_input: port_pcm_port_3_subnetpoolid fixed_ips: get_input: - port_pcm_port_3_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_3_subnetpoolid network: get_input: - port_pcm_port_3_network @@ -202,6 +216,10 @@ topology_template: pcma_server_pcm_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_2_mac_requirements + order: + get_input: port_pcm_port_2_order security_groups: get_input: - port_pcm_port_2_security_groups @@ -210,22 +228,22 @@ topology_template: get_input: port_pcm_port_2_exCP_naming vlan_requirements: get_input: port_pcm_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_2_ip_requirements network_role_tag: get_input: port_pcm_port_2_network_role_tag - mac_requirements: - get_input: port_pcm_port_2_mac_requirements - order: - get_input: port_pcm_port_2_order network_role: get_input: port_pcm_port_2_network_role - subnetpoolid: - get_input: port_pcm_port_2_subnetpoolid fixed_ips: get_input: - port_pcm_port_2_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_2_subnetpoolid network: get_input: - port_pcm_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml index 7cc130e234..7a3ec20712 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_0_network_role: type: string required: true + port_pcm_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -64,6 +69,11 @@ topology_template: port_pcm_port_1_network_role: type: string required: true + port_pcm_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pcm_port_1_network: type: list required: true @@ -157,6 +167,10 @@ topology_template: pcma_server_pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_0_mac_requirements + order: + get_input: port_pcm_port_0_order security_groups: get_input: - port_pcm_port_0_security_groups @@ -165,22 +179,22 @@ topology_template: get_input: port_pcm_port_0_exCP_naming vlan_requirements: get_input: port_pcm_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_0_ip_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - mac_requirements: - get_input: port_pcm_port_0_mac_requirements - order: - get_input: port_pcm_port_0_order network_role: get_input: port_pcm_port_0_network_role - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid fixed_ips: get_input: - port_pcm_port_0_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid network: get_input: - port_pcm_port_0_network @@ -193,6 +207,10 @@ topology_template: pcma_server_pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_1_mac_requirements + order: + get_input: port_pcm_port_1_order security_groups: get_input: - port_pcm_port_1_security_groups @@ -201,22 +219,22 @@ topology_template: get_input: port_pcm_port_1_exCP_naming vlan_requirements: get_input: port_pcm_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_1_ip_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - mac_requirements: - get_input: port_pcm_port_1_mac_requirements - order: - get_input: port_pcm_port_1_order network_role: get_input: port_pcm_port_1_network_role - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid fixed_ips: get_input: - port_pcm_port_1_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid network: get_input: - port_pcm_port_1_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index c6ff74820a..8f8d2f7a73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -112,6 +112,8 @@ topology_template: directives: - substitutable properties: + port_pcm_port_0_subinterface_indicator: + - true port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: @@ -125,6 +127,8 @@ topology_template: vm_image_name: get_input: pcma_image_name port_pcm_port_0_network_role_tag: cps + port_pcm_port_1_subinterface_indicator: + - true port_pcm_port_1_network: - get_input: oam_net_name port_pcm_port_0_ip_requirements: @@ -187,6 +191,8 @@ topology_template: port_pcm_port_2_fixed_ips: - ip_address: get_input: cps_net_ip + port_pcm_port_2_subinterface_indicator: + - true vm_flavor_name: get_input: pcma_flavor_name port_pcm_port_3_security_groups: @@ -219,6 +225,8 @@ topology_template: get_input: oam_net_ip compute_pcma_server_user_data_format: - RAW + port_pcm_port_3_subinterface_indicator: + - true port_pcm_port_2_network: - get_input: cps_net_name port_pcm_port_2_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 319a10bdd3..484bf5e953 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -90,6 +90,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd_server_nested2_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean requirements: - dependency_pd_server_nested2_1b: capability: tosca.capabilities.Node @@ -327,6 +333,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -535,6 +542,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -560,6 +568,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1106,6 +1115,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1136,6 +1146,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1383,6 +1394,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1454,6 +1466,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1937,6 +1950,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2008,6 +2022,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2372,6 +2387,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cmaui_1c1_main_name: type: list required: true @@ -2686,6 +2707,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3868,6 +3890,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3897,6 +3920,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4098,6 +4122,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4218,6 +4243,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4571,6 +4597,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4842,6 +4869,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5186,6 +5214,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5469,6 +5498,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5979,6 +6009,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6516,6 +6547,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6599,6 +6631,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6677,6 +6710,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6853,6 +6887,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6866,6 +6901,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6992,6 +7028,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_main_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_main_1b_port_order: type: integer required: true @@ -7118,6 +7160,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7974,6 +8017,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8056,6 +8100,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8099,6 +8144,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8106,6 +8152,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8797,6 +8844,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8810,6 +8858,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -9584,6 +9633,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -9710,6 +9760,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -9798,6 +9849,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_main_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -9976,6 +10033,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -10224,6 +10282,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server_main_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_main_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -10402,6 +10466,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -10755,6 +10820,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_main_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_main_1b_port_order: type: integer required: true @@ -10881,6 +10952,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -11211,6 +11283,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -11536,6 +11614,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -11569,6 +11648,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_nested2_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_nested2_1b_port_ip_requirements: type: list required: true @@ -11963,6 +12048,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -12063,6 +12149,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cmaui_1c1_main_name: type: list required: true @@ -12377,6 +12469,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -12608,6 +12701,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -12679,6 +12773,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml index 28af7b7e22..fc63cd5fd9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml @@ -1,474 +1,481 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- ps_server_main_1b_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: ps_server_main_1b_image
- type: string
- description: Ps Image server
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: security_group_name
- type: string
- description: security_group_name
- cmaui_1c1_main_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: cmaui_1c1_main_names
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- contrail_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: contrail_net_name
- type: string
- description: network name of contrail v2 network
- ps_server_main_1b_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: ps_server_main_1b_flavor
- type: string
- description: Flavor for PS server
- ps_server_main_1b_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: ps_server_main_1b_ips
- type: string
- jsa_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: jsa_net_name
- type: string
- description: network name of jsa network
- jsa_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: jsa_name
- type: string
- description: network name of jsa log network
- pd_server_main_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: pd_server_main_1b_names
- type: list
- description: PD server names
- entry_schema:
- type: string
- cmaui_1c1_main_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: cmaui_1c1_main_flavor
- type: string
- description: Flavor for CMAUI server
- pd_server_main_1b_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: pd_server_main_1b_flavor
- type: string
- description: Flavor for PD server
- cmaui_1c1_main_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: cmaui_1c1_main_image
- type: string
- description: Image for CMAUI server
- ps_server_main_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: ps_server_main_1b_names
- type: list
- description: Ps server names
- entry_schema:
- type: string
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_0
- type: string
- description: availabilityzone name
- cmaui_oam_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: cmaui_oam_ips
- type: string
- pd_server_main_1b_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: pd_server_main_1b_image
- type: string
- description: PD Image server
- pd_server_main_1b_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: pd_server_main_1b_ips
- type: string
- node_templates:
- abstract_pd_server_main_1b_1:
- type: org.openecomp.resource.abstract.nodes.pd_server_main_1b_1
- directives:
- - substitutable
- properties:
- compute_pd_server_main_1b_availability_zone:
- - get_input: availability_zone_0
- port_pd_server_main_1b_port_replacement_policy:
- - AUTO
- port_pd_server_main_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_server_main_1b_flavor
- vm_image_name:
- get_input: pd_server_main_1b_image
- compute_pd_server_main_1b_name:
- - get_input:
- - pd_server_main_1b_names
- - 0
- port_pd_server_main_1b_port_network:
- - get_input: jsa_name
- port_pd_server_main_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_main_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_main_1b_ips
- - 0
- service_template_filter:
- substitute_service_template: Nested_pd_server_main_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_ps_server_main_1b_1:
- type: org.openecomp.resource.abstract.nodes.ps_server_main_1b_1
- directives:
- - substitutable
- properties:
- port_ps_server_main_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_main_1b_ips
- - 0
- port_ps_server_main_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_ps_server_main_1b_availability_zone:
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: ps_server_main_1b_flavor
- vm_image_name:
- get_input: ps_server_main_1b_image
- compute_ps_server_main_1b_name:
- - get_input:
- - ps_server_main_1b_names
- - 1
- port_ps_server_main_1b_port_replacement_policy:
- - AUTO
- port_ps_server_main_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_main_1b_port_network:
- - get_input: jsa_name
- service_template_filter:
- substitute_service_template: Nested_ps_server_main_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_nested1Level_duplicate_same_file:
- type: org.openecomp.resource.abstract.nodes.heat.nested1
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested1ServiceTemplate.yaml
- name:
- get_input: security_group_name
- test_nested_no_compute:
- type: org.openecomp.resource.abstract.nodes.heat.nested1-no-compute
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested1-no-computeServiceTemplate.yaml
- name:
- get_input: jsa_net_name
- abstract_cmaui_1c1_main_1:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - get_input: contrail_net_name
- - get_input: contrail_net_name
- port_cmaui_port_network_role_tag: contrail
- vm_flavor_name:
- get_input: cmaui_1c1_main_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_main_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_main_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- compute_cmaui_1c1_main_name:
- - get_input:
- - cmaui_1c1_main_names
- - 1
- - get_input:
- - cmaui_1c1_main_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1_main_1ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_nested_pattern_4_main_0:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
- directives:
- - substitutable
- properties:
- p1:
- get_input: jsa_name
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- port_pd_server_pattern4_port_01_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_01_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- test_nested1Level:
- type: org.openecomp.resource.abstract.nodes.heat.nested1
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested1ServiceTemplate.yaml
- name:
- get_input: security_group_name
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - test_nested1Level
- - test_nested1Level_duplicate_same_file
- - test_nested_no_compute
- - test_nested_pattern_4_main_0
- - abstract_pd_server_main_1b_1
- - abstract_ps_server_main_1b_1
- - abstract_cmaui_1c1_main_1
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + ps_server_main_1b_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_image + type: string + description: Ps Image server + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: security_group_name + type: string + description: security_group_name + cmaui_1c1_main_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_names + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + contrail_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: contrail_net_name + type: string + description: network name of contrail v2 network + ps_server_main_1b_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_flavor + type: string + description: Flavor for PS server + ps_server_main_1b_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_ips + type: string + jsa_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_net_name + type: string + description: network name of jsa network + jsa_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name + type: string + description: network name of jsa log network + pd_server_main_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_names + type: list + description: PD server names + entry_schema: + type: string + cmaui_1c1_main_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_flavor + type: string + description: Flavor for CMAUI server + pd_server_main_1b_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_flavor + type: string + description: Flavor for PD server + cmaui_1c1_main_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_1c1_main_image + type: string + description: Image for CMAUI server + ps_server_main_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: ps_server_main_1b_names + type: list + description: Ps server names + entry_schema: + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_0 + type: string + description: availabilityzone name + cmaui_oam_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: cmaui_oam_ips + type: string + pd_server_main_1b_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_image + type: string + description: PD Image server + pd_server_main_1b_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: pd_server_main_1b_ips + type: string + node_templates: + abstract_pd_server_main_1b_1: + type: org.openecomp.resource.abstract.nodes.pd_server_main_1b_1 + directives: + - substitutable + properties: + port_pd_server_main_1b_port_subinterface_indicator: + - true + compute_pd_server_main_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_main_1b_port_replacement_policy: + - AUTO + port_pd_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_main_1b_flavor + vm_image_name: + get_input: pd_server_main_1b_image + compute_pd_server_main_1b_name: + - get_input: + - pd_server_main_1b_names + - 0 + port_pd_server_main_1b_port_network: + - get_input: jsa_name + port_pd_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_main_1b_ips + - 0 + service_template_filter: + substitute_service_template: Nested_pd_server_main_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server_main_1b_1: + type: org.openecomp.resource.abstract.nodes.ps_server_main_1b_1 + directives: + - substitutable + properties: + port_ps_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 + port_ps_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: ps_server_main_1b_flavor + port_ps_server_main_1b_port_subinterface_indicator: + - true + vm_image_name: + get_input: ps_server_main_1b_image + compute_ps_server_main_1b_name: + - get_input: + - ps_server_main_1b_names + - 1 + port_ps_server_main_1b_port_replacement_policy: + - AUTO + port_ps_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_network: + - get_input: jsa_name + service_template_filter: + substitute_service_template: Nested_ps_server_main_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_nested1Level_duplicate_same_file: + type: org.openecomp.resource.abstract.nodes.heat.nested1 + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested1ServiceTemplate.yaml + name: + get_input: security_group_name + test_nested_no_compute: + type: org.openecomp.resource.abstract.nodes.heat.nested1-no-compute + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested1-no-computeServiceTemplate.yaml + name: + get_input: jsa_net_name + abstract_cmaui_1c1_main_1: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main_1 + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - get_input: contrail_net_name + - get_input: contrail_net_name + port_cmaui_port_network_role_tag: contrail + vm_flavor_name: + get_input: cmaui_1c1_main_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_main_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_main_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_port_subinterface_indicator: + - true + - true + compute_cmaui_1c1_main_name: + - get_input: + - cmaui_1c1_main_names + - 1 + - get_input: + - cmaui_1c1_main_names + - 0 + service_template_filter: + substitute_service_template: Nested_cmaui_1c1_main_1ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_nested_pattern_4_main_0: + type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 + directives: + - substitutable + properties: + p1: + get_input: jsa_name + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + port_pd_server_pattern4_port_01_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_02_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_pattern4_port_02_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + test_nested1Level: + type: org.openecomp.resource.abstract.nodes.heat.nested1 + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested1ServiceTemplate.yaml + name: + get_input: security_group_name + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - test_nested1Level + - test_nested1Level_duplicate_same_file + - test_nested_no_compute + - test_nested_pattern_4_main_0 + - abstract_pd_server_main_1b_1 + - abstract_ps_server_main_1b_1 + - abstract_cmaui_1c1_main_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index 6d9fc2d984..f3120be438 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cmaui_1c1_main_name: type: list required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_main_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index 833b7db72f..fecb92251b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cmaui_1c1_main_name: type: list required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_main_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 8e4cc7a853..d3b2646004 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_nested2_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index 4df9815884..dd00330a2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_main_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -96,30 +101,34 @@ topology_template: pd_server_main_1b_pd_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_main_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_main_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_main_1b_port_mac_requirements + order: + get_input: port_pd_server_main_1b_port_order + exCP_naming: + get_input: port_pd_server_main_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_main_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_main_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_main_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_main_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_main_1b_port_mac_requirements - order: - get_input: port_pd_server_main_1b_port_order network_role: get_input: port_pd_server_main_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_main_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_main_1b_port_subnetpoolid network: get_input: - port_pd_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index aebce2e03e..e80ff4a301 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_main_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -96,30 +101,34 @@ topology_template: pd_server_main_1b_pd_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_main_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_main_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_main_1b_port_mac_requirements + order: + get_input: port_pd_server_main_1b_port_order + exCP_naming: + get_input: port_pd_server_main_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_main_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_main_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_main_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_main_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_main_1b_port_mac_requirements - order: - get_input: port_pd_server_main_1b_port_order network_role: get_input: port_pd_server_main_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_main_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_main_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_main_1b_port_subnetpoolid network: get_input: - port_pd_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 4001321f04..b742da4d91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -77,6 +77,11 @@ topology_template: port_pd_server_nested2_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd_server_nested2_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean node_templates: pd_server_nested2_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_nested2_1b @@ -96,30 +101,34 @@ topology_template: pd_server_nested2_1b_pd_server_nested2_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_nested2_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_nested2_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_nested2_1b_port_mac_requirements + order: + get_input: port_pd_server_nested2_1b_port_order + exCP_naming: + get_input: port_pd_server_nested2_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_nested2_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_nested2_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_nested2_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_nested2_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_nested2_1b_port_mac_requirements - order: - get_input: port_pd_server_nested2_1b_port_order network_role: get_input: port_pd_server_nested2_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_nested2_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_nested2_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_nested2_1b_port_subnetpoolid network: get_input: - port_pd_server_nested2_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index a548689251..389638daf1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_ps_server_main_1b_port_network_role: type: string required: true + port_ps_server_main_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_main_1b_port_order: type: integer required: true @@ -81,30 +86,34 @@ topology_template: ps_server_main_1b_ps_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_main_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_main_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_main_1b_port_mac_requirements + order: + get_input: port_ps_server_main_1b_port_order + exCP_naming: + get_input: port_ps_server_main_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_main_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_main_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_main_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_main_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_main_1b_port_mac_requirements - order: - get_input: port_ps_server_main_1b_port_order network_role: get_input: port_ps_server_main_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_main_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_main_1b_port_subnetpoolid network: get_input: - port_ps_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index 441619e55a..6b46235339 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_ps_server_main_1b_port_network_role: type: string required: true + port_ps_server_main_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_main_1b_port_order: type: integer required: true @@ -81,30 +86,34 @@ topology_template: ps_server_main_1b_ps_server_main_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_main_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_main_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_main_1b_port_mac_requirements + order: + get_input: port_ps_server_main_1b_port_order + exCP_naming: + get_input: port_ps_server_main_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_main_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_main_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_main_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_main_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_main_1b_port_mac_requirements - order: - get_input: port_ps_server_main_1b_port_order network_role: get_input: port_ps_server_main_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_main_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_main_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_main_1b_port_subnetpoolid network: get_input: - port_ps_server_main_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index 321073a360..9e09392294 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_ps_server_nested2_1b_port_network_role_tag: type: string required: true + port_ps_server_nested2_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_nested2_1b_port_ip_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: ps_server_nested2_1b_ps_server_nested2_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_nested2_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_nested2_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_nested2_1b_port_mac_requirements + order: + get_input: port_ps_server_nested2_1b_port_order + exCP_naming: + get_input: port_ps_server_nested2_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_nested2_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_nested2_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_nested2_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_nested2_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_nested2_1b_port_mac_requirements - order: - get_input: port_ps_server_nested2_1b_port_order network_role: get_input: port_ps_server_nested2_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_nested2_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_nested2_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_nested2_1b_port_subnetpoolid network: get_input: - port_ps_server_nested2_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index b530f8572a..a55fd6c746 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -1,2406 +1,2413 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- ps_server_main_1b_image:
- hidden: false
- immutable: false
- type: string
- description: Ps Image server
- security_group_name:
- hidden: false
- immutable: false
- type: string
- description: security_group_name
- cmaui_1c1_main_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- contrail_net_name:
- hidden: false
- immutable: false
- type: string
- description: network name of contrail v2 network
- ps_server_main_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PS server
- ps_server_main_1b_ips:
- hidden: false
- immutable: false
- type: string
- jsa_net_name:
- hidden: false
- immutable: false
- type: string
- description: network name of jsa network
- jsa_name:
- hidden: false
- immutable: false
- type: string
- description: network name of jsa log network
- pd_server_main_1b_names:
- hidden: false
- immutable: false
- type: list
- description: PD server names
- entry_schema:
- type: string
- cmaui_1c1_main_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- pd_server_main_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- cmaui_1c1_main_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- ps_server_main_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- name:
- hidden: false
- immutable: false
- type: string
- description: nested parameter
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- pd_server_main_1b_image:
- hidden: false
- immutable: false
- type: string
- description: PD Image server
- pd_server_main_1b_ips:
- hidden: false
- immutable: false
- type: string
- node_templates:
- test_nested_pattern_4_main_1:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
- directives:
- - substitutable
- properties:
- p1:
- get_input: jsa_name
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- port_pd_server_pattern4_port_01_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_01_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- abstract_ps_server_main_1b:
- type: org.openecomp.resource.abstract.nodes.ps_server_main_1b
- directives:
- - substitutable
- properties:
- port_ps_server_main_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_main_1b_ips
- - 0
- port_ps_server_main_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_ps_server_main_1b_availability_zone:
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: ps_server_main_1b_flavor
- vm_image_name:
- get_input: ps_server_main_1b_image
- compute_ps_server_main_1b_name:
- - get_input:
- - ps_server_main_1b_names
- - 1
- port_ps_server_main_1b_port_replacement_policy:
- - AUTO
- port_ps_server_main_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_main_1b_port_network:
- - get_input: jsa_name
- service_template_filter:
- substitute_service_template: Nested_ps_server_main_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_cmaui_1c1_main:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - get_input: contrail_net_name
- - get_input: contrail_net_name
- port_cmaui_port_network_role_tag: contrail
- vm_flavor_name:
- get_input: cmaui_1c1_main_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_main_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_main_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- compute_cmaui_1c1_main_name:
- - get_input:
- - cmaui_1c1_main_names
- - 0
- - get_input:
- - cmaui_1c1_main_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1_mainServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_pd_server_main_1b:
- type: org.openecomp.resource.abstract.nodes.pd_server_main_1b
- directives:
- - substitutable
- properties:
- compute_pd_server_main_1b_availability_zone:
- - get_input: availability_zone_0
- port_pd_server_main_1b_port_replacement_policy:
- - AUTO
- port_pd_server_main_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_server_main_1b_flavor
- vm_image_name:
- get_input: pd_server_main_1b_image
- compute_pd_server_main_1b_name:
- - get_input:
- - pd_server_main_1b_names
- - 0
- port_pd_server_main_1b_port_network:
- - get_input: jsa_name
- port_pd_server_main_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_main_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_main_1b_ips
- - 0
- service_template_filter:
- substitute_service_template: Nested_pd_server_main_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_nested2Level:
- type: org.openecomp.resource.abstract.nodes.heat.nested2
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested2ServiceTemplate.yaml
- name:
- get_input: security_group_name
- groups:
- nested1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested1.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - test_nested_pattern_4_main_1
- - test_nested2Level
- - abstract_pd_server_main_1b
- - abstract_ps_server_main_1b
- - abstract_cmaui_1c1_main
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested1
- capabilities:
- feature_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - feature_server_pd_pattern4_test_nested_pattern_4_nested2
- instance_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - instance_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.ephemeral.size_server_pd_pattern4
- disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2
- feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - feature_test_nested_pattern_4_same_type_diff_file
- disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2
- network.incoming.packets_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_cmaui_port_2
- network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outpoing.packets_pd_server_pattern4_port_01
- cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.read.requests_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.read.requests_cmaui_1c1_main
- disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.read.bytes_server_pd_pattern4
- disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_nested2_1c1_cmaui_2
- disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- binding_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - binding_cmaui_1c1_main
- cpu_util_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - cpu_util_server_pd_pattern4
- disk.ephemeral.size_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_nested2_pd_1b
- host_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - host_server_nested2_pd_1b
- disk.device.latency_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.latency_ps_server_main_1b
- feature_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - feature_server_nested2_pd_1b
- disk.device.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_nested2_1c1_cmaui_2
- cpu_util_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - cpu_util_pd_server_main_1b
- disk.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_nested2_1c1_cmaui_1
- disk.device.latency_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.latency_pd_server_main_1b
- disk.device.write.requests_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_nested2_ps_1b
- disk.device.read.requests_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.read.requests_cmaui_1c1_main
- feature_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - feature_cmaui_1c1_main
- disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.allocation_server_pd_pattern4
- disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2
- network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.bytes_pd_server_pattern4_port_02
- attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_nested2_pd_1b
- network.incoming.bytes_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port
- network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.bytes.rate_pd_server_pattern4_port_02
- disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.read.requests_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_nested2_ps_1b
- disk.root.size_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_nested2_ps_1b
- forwarder_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - forwarder_cmaui_1c1_main_cmaui_port
- disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_nested2_1c1_cmaui_2
- forwarder_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - forwarder_cmaui_1c1_main_cmaui_port
- feature_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - feature_ps_server_main_1b_ps_server_main_1b_port
- vcpus_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - vcpus_pd_server_main_1b
- disk.device.usage_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_nested2_pd_1b
- disk.usage_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_nested2_ps_1b
- forwarder_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - forwarder_cmaui_port_2
- os_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - os_server_pd_pattern4
- disk.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_nested2_1c1_cmaui_1
- disk.device.capacity_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_nested2_ps_1b
- memory.resident_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_nested2_pd_1b
- network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.bytes.rate_pd_server_pattern4_port_02
- disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.write.bytes.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.write.bytes.rate_pd_server_main_1b
- instance_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - instance_pd_server_main_1b
- disk.read.bytes.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.read.bytes.rate_ps_server_main_1b
- feature_test_nested2Level:
- - test_nested2Level
- - feature
- disk.read.bytes.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.read.bytes.rate_pd_server_main_1b
- cpu.delta_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_nested2_1c1_cmaui_2
- disk.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.read.requests_server_pd_pattern4
- disk.write.bytes_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_nested2_ps_1b
- network.outgoing.bytes.rate_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
- disk.ephemeral.size_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_nested2_1c1_cmaui_1
- memory_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - memory_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
- network.outgoing.packets.rate_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port
- network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- binding_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - binding_cmaui_1c1_main
- network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.bytes_pd_server_pattern4_port_02
- disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.read.bytes.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_nested2_pd_1b
- attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- cpu_util_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_nested2_ps_1b
- instance_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - instance_ps_server_main_1b
- network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_ps_server_nested2_1b_port
- network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- memory.usage_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_nested2_ps_1b
- disk.capacity_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_nested2_1c1_cmaui_2
- disk.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_nested2_1c1_cmaui_2
- disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.allocation_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.allocation_pd_server_main_1b
- endpoint_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - endpoint_cmaui_1c1_main
- host_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - host_server_pd_pattern4
- disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.usage_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.usage_cmaui_1c1_main
- network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.device.write.requests_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.write.requests_pd_server_main_1b
- cpu_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - cpu_server_pd_pattern4
- feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2
- host_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - host_pd_server_main_1b
- feature_jsa_security_group2_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - feature_jsa_security_group2_test_resourceGroup
- memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.incoming.packets.rate_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_cmaui_port_1
- cpu.delta_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - cpu.delta_ps_server_main_1b
- binding_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - binding_server_pd_pattern4
- cpu_util_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - cpu_util_ps_server_main_1b
- disk.write.bytes_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.write.bytes_cmaui_1c1_main
- network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_pd_server_nested2_1b_port
- disk.usage_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.usage_cmaui_1c1_main
- network.incoming.packets.rate_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_cmaui_port_2
- disk.device.write.bytes.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.write.bytes.rate_ps_server_main_1b
- cpu_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - cpu_server_nested2_ps_1b
- binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - binding_pd_server_pattern4_port_02
- forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_nested2_1c1_cmaui_1
- forwarder_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - forwarder_ps_server_main_1b_ps_server_main_1b_port
- binding_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - binding_ps_server_main_1b_ps_server_main_1b_port
- feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - feature_pd_server_pattern4_port_01
- network.outgoing.bytes.rate_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
- disk.read.bytes_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_nested2_pd_1b
- network.outgoing.bytes.rate_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port
- network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- os_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - os_ps_server_main_1b
- disk.device.read.bytes_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.read.bytes_pd_server_main_1b
- attachment_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - attachment_ps_server_main_1b_ps_server_main_1b_port
- cpu.delta_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_nested2_ps_1b
- feature_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - feature_ps_server_nested2_1b_port
- disk.latency_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.latency_cmaui_1c1_main
- disk.write.bytes_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.write.bytes_cmaui_1c1_main
- disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_nested2_pd_1b
- disk.device.read.bytes.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.read.bytes.rate_pd_server_main_1b
- network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_ps_server_nested2_1b_port
- network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- feature_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - feature_server_nested2_1c1_cmaui_2
- endpoint_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - endpoint_cmaui_1c1_main
- network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.read.bytes.rate_server_pd_pattern4
- disk.device.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_nested2_1c1_cmaui_1
- feature_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - feature_ps_server_main_1b
- network.outpoing.packets_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port
- disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_nested2_1c1_cmaui_1
- disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.incoming.bytes.rate_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_pd_server_nested2_1b_port
- binding_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - binding_server_nested2_pd_1b
- disk.latency_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.latency_cmaui_1c1_main
- forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.root.size_server_pd_pattern4
- binding_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - binding_server_nested2_1c1_cmaui_2
- network.outgoing.packets.rate_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_cmaui_port_1
- disk.device.write.bytes_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.write.bytes_pd_server_main_1b
- binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1
- disk.ephemeral.size_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.ephemeral.size_ps_server_main_1b
- disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_nested2_1c1_cmaui_1
- disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.iops_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.iops_cmaui_1c1_main
- network.outgoing.bytes_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_cmaui_port_2
- forwarder_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - forwarder_pd_server_nested2_1b_port
- network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.read.bytes.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.read.bytes.rate_ps_server_main_1b
- disk.device.usage_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.usage_cmaui_1c1_main
- disk.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_nested2_1c1_cmaui_2
- disk.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_nested2_1c1_cmaui_2
- disk.device.read.bytes.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.read.bytes.rate_cmaui_1c1_main
- network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_cmaui_port_2
- disk.device.write.requests.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.write.requests.rate_pd_server_main_1b
- network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.iops_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.iops_server_pd_pattern4
- network.incoming.packets.rate_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port
- binding_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - binding_cmaui_port_1
- disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- memory.usage_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - memory.usage_pd_server_main_1b
- disk.root.size_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.root.size_ps_server_main_1b
- network.incoming.packets_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port
- network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.packets.rate_pd_server_pattern4_port_02
- disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2
- disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2
- scalable_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - scalable_cmaui_1c1_main
- disk.device.read.requests.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_nested2_ps_1b
- disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.write.bytes.rate_server_pd_pattern4
- disk.iops_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.iops_cmaui_1c1_main
- os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_nested2_1c1_cmaui_1
- network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.packets.rate_pd_server_pattern4_port_02
- disk.capacity_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.capacity_pd_server_main_1b
- disk.device.write.requests_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.write.requests_cmaui_1c1_main
- disk.read.requests_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.read.requests_pd_server_main_1b
- disk.allocation_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_nested2_1c1_cmaui_2
- disk.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_nested2_1c1_cmaui_1
- network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.bytes_pd_server_pattern4_port_01
- network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_nested2_1c1_cmaui_1
- network.outgoing.bytes.rate_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_pd_server_nested2_1b_port
- disk.write.requests_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_nested2_ps_1b
- disk.write.requests_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.write.requests_pd_server_main_1b
- disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_nested2_ps_1b
- instance_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - instance_server_nested2_1c1_cmaui_2
- network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_pd_server_nested2_1b_port
- disk.latency_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.latency_ps_server_main_1b
- os_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - os_server_nested2_pd_1b
- disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.read.bytes_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.read.bytes_pd_server_main_1b
- disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.write.requests_server_pd_pattern4
- disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_nested2_pd_1b
- cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.write.requests.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.write.requests.rate_ps_server_main_1b
- disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.latency_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_nested2_1c1_cmaui_2
- network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_ps_server_nested2_1b_port
- feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - feature_pd_server_pattern4_port_02
- network.outgoing.packets.rate_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_cmaui_port_2
- network.outgoing.bytes_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
- endpoint_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - endpoint_pd_server_main_1b
- disk.allocation_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.allocation_cmaui_1c1_main
- disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.outgoing.bytes_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.outgoing.bytes_cmaui_1c1_main_cmaui_port
- vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.write.bytes_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_nested2_pd_1b
- network.incoming.packets.rate_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_ps_server_nested2_1b_port
- network.incoming.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_pd_server_nested2_1b_port
- endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1
- cpu.delta_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - cpu.delta_server_pd_pattern4
- disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_nested2_1c1_cmaui_1
- network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- scalable_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - scalable_server_nested2_pd_1b
- network.incoming.packets_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port
- binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- network.incoming.packets.rate_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port
- forwarder_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - forwarder_ps_server_nested2_1b_port
- network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.device.usage_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.usage_cmaui_1c1_main
- disk.capacity_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_nested2_ps_1b
- binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- host_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - host_ps_server_main_1b
- disk.root.size_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.root.size_pd_server_main_1b
- memory.usage_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - memory.usage_ps_server_main_1b
- network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_ps_server_nested2_1b_port
- instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- os_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - os_server_nested2_ps_1b
- scalable_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - scalable_ps_server_main_1b
- disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.capacity_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.capacity_cmaui_1c1_main
- disk.device.read.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_nested2_1c1_cmaui_2
- host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- memory.resident_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - memory.resident_ps_server_main_1b
- os_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - os_pd_server_main_1b
- disk.device.read.bytes_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.read.bytes_cmaui_1c1_main
- disk.latency_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_nested2_ps_1b
- disk.root.size_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_nested2_1c1_cmaui_2
- binding_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - binding_server_pd_pattern4_test_nested_pattern_4_nested2
- network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.bytes_pd_server_pattern4_port_01
- memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_nested2_1c1_cmaui_1
- vcpus_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - vcpus_server_nested2_ps_1b
- disk.device.iops_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_nested2_1c1_cmaui_2
- network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.write.requests_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.write.requests_ps_server_main_1b
- forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - forwarder_pd_server_pattern4_port_02
- memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.allocation_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.allocation_cmaui_1c1_main
- feature_jsa_security_group1_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - feature_jsa_security_group1_test_nested3Level
- disk.device.read.requests_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.read.requests_ps_server_main_1b
- network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.read.bytes_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.read.bytes_cmaui_1c1_main
- disk.capacity_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_nested2_1c1_cmaui_1
- disk.write.requests.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.write.requests.rate_cmaui_1c1_main
- disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.allocation_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.allocation_cmaui_1c1_main
- disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_nested2_pd_1b
- disk.device.allocation_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.allocation_cmaui_1c1_main
- disk.capacity_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.capacity_ps_server_main_1b
- binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.read.requests_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_nested2_ps_1b
- cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.read.bytes_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_nested2_ps_1b
- network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- scalable_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - scalable_server_pd_pattern4
- disk.device.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.latency_server_pd_pattern4
- disk.write.requests.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.write.requests.rate_cmaui_1c1_main
- scalable_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - scalable_cmaui_1c1_main
- disk.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_nested2_1c1_cmaui_2
- disk.device.write.requests_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.write.requests_cmaui_1c1_main
- disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_nested2_1c1_cmaui_1
- instance_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - instance_server_pd_pattern4
- disk.allocation_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_nested2_pd_1b
- feature_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - feature_cmaui_1c1_main
- forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - forwarder_pd_server_pattern4_port_01
- disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_nested2_1c1_cmaui_2
- disk.device.capacity_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.capacity_cmaui_1c1_main
- scalable_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - scalable_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.write.bytes.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.write.bytes.rate_pd_server_main_1b
- feature_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - feature_test_nested3Level
- disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.iops_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.iops_pd_server_main_1b
- disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_nested2_1c1_cmaui_2
- feature_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - feature_pd_server_main_1b
- network.incoming.bytes_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.incoming.bytes_cmaui_1c1_main_cmaui_port
- network.incoming.bytes_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.incoming.bytes_cmaui_1c1_main_cmaui_port
- scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- forwarder_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - forwarder_cmaui_port_1
- disk.latency_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_nested2_pd_1b
- memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- cpu.delta_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - cpu.delta_cmaui_1c1_main
- disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.write.requests.rate_server_pd_pattern4
- disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.write.requests_server_pd_pattern4
- disk.device.write.bytes_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.write.bytes_cmaui_1c1_main
- disk.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_nested2_1c1_cmaui_2
- cpu_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - cpu_server_nested2_pd_1b
- network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.packets.rate_pd_server_pattern4_port_01
- disk.device.allocation_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_nested2_1c1_cmaui_2
- disk.device.allocation_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.allocation_pd_server_main_1b
- disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.read.bytes_server_pd_pattern4
- vcpus_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - vcpus_server_nested2_pd_1b
- disk.device.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_nested2_1c1_cmaui_1
- network.incoming.bytes_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_cmaui_port_1
- disk.device.latency_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.latency_cmaui_1c1_main
- disk.device.allocation_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_nested2_1c1_cmaui_1
- vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- cpu_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - cpu_cmaui_1c1_main
- endpoint_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - endpoint_server_nested2_1c1_cmaui_2
- disk.write.bytes.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.write.bytes.rate_ps_server_main_1b
- disk.device.read.requests.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.read.requests.rate_pd_server_main_1b
- feature_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - feature
- memory.usage_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_nested2_pd_1b
- disk.device.write.bytes_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_nested2_pd_1b
- disk.device.capacity_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.capacity_ps_server_main_1b
- network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.packets.rate_pd_server_pattern4_port_01
- disk.device.write.bytes_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.write.bytes_cmaui_1c1_main
- network.incoming.bytes_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_cmaui_port_2
- binding_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - binding_pd_server_main_1b_pd_server_main_1b_port
- disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.write.bytes_server_pd_pattern4
- disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2
- memory.resident_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - memory.resident_pd_server_main_1b
- network.incoming.bytes_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port
- vcpus_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - vcpus_server_nested2_1c1_cmaui_1
- disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_nested2_1c1_cmaui_1
- disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_nested2_ps_1b
- endpoint_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - endpoint_server_nested2_1c1_cmaui_1
- attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.iops_server_pd_pattern4
- network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.device.read.requests_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_nested2_pd_1b
- attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - attachment_pd_server_pattern4_port_02
- memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - memory.resident_server_pd_pattern4
- feature_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - feature_pd_server_main_1b_pd_server_main_1b_port
- host_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - host_cmaui_1c1_main
- network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_nested2_ps_1b
- disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
- network.outgoing.bytes_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_pd_server_nested2_1b_port
- network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes.rate_server_nested2_ps_1b
- disk.device.usage_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.usage_ps_server_main_1b
- network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.device.capacity_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_nested2_1c1_cmaui_2
- disk.device.write.requests_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_nested2_pd_1b
- forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_nested2_1c1_cmaui_2
- disk.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_nested2_1c1_cmaui_1
- network.incoming.bytes.rate_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_cmaui_port_2
- disk.device.latency_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.latency_cmaui_1c1_main
- disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- network.incoming.packets.rate_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
- network.incoming.packets.rate_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port
- disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests.rate_server_nested2_pd_1b
- disk.device.allocation_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.allocation_ps_server_main_1b
- vcpus_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - vcpus_cmaui_1c1_main
- attachment_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - attachment_pd_server_main_1b_pd_server_main_1b_port
- disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.incoming.bytes.rate_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_cmaui_port_1
- os_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - os_server_nested2_1c1_cmaui_2
- disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- memory.resident_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - memory.resident_cmaui_1c1_main
- network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_pd_server_nested2_1b_port
- disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.outpoing.packets_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.outpoing.packets_cmaui_1c1_main_cmaui_port
- binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- network.outpoing.packets_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.outpoing.packets_cmaui_1c1_main_cmaui_port
- disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.usage_server_pd_pattern4
- memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_nested2_1c1_cmaui_2
- disk.capacity_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_nested2_pd_1b
- disk.ephemeral.size_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.ephemeral.size_cmaui_1c1_main
- cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - cpu_server_pd_pattern4_test_nested_pattern_4_nested2
- binding_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - binding_pd_server_main_1b
- memory.resident_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - memory.resident_cmaui_1c1_main
- disk.device.read.requests.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.read.requests.rate_cmaui_1c1_main
- disk.device.capacity_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.capacity_pd_server_main_1b
- disk.read.bytes_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.read.bytes_cmaui_1c1_main
- os_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - os_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_nested2_1c1_cmaui_1
- host_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - host_server_nested2_ps_1b
- host_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - host_server_pd_pattern4_test_nested_pattern_4_nested2
- cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_nested2_1c1_cmaui_1
- network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.root.size_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.root.size_cmaui_1c1_main
- disk.usage_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.usage_ps_server_main_1b
- cpu_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - cpu_pd_server_main_1b
- disk.read.requests_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.read.requests_cmaui_1c1_main
- memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_pd_server_nested2_1b_port
- disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.read.requests.rate_server_pd_pattern4
- disk.ephemeral.size_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.ephemeral.size_cmaui_1c1_main
- host_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - host_cmaui_1c1_main
- disk.device.iops_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.iops_cmaui_1c1_main
- disk.device.latency_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_nested2_ps_1b
- disk.device.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_nested2_1c1_cmaui_2
- cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_nested2_1c1_cmaui_2
- instance_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - instance_cmaui_1c1_main
- memory_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - memory_server_nested2_1c1_cmaui_2
- disk.device.read.requests.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.read.requests.rate_ps_server_main_1b
- disk.device.read.requests.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.read.requests.rate_cmaui_1c1_main
- disk.read.bytes_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.read.bytes_cmaui_1c1_main
- network.outpoing.packets_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port
- disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_nested2_pd_1b
- disk.root.size_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.root.size_server_nested2_pd_1b
- endpoint_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - endpoint_server_nested2_ps_1b
- attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.packets_pd_server_pattern4_port_01
- disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2
- disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.capacity_server_pd_pattern4
- disk.device.read.bytes.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_nested2_ps_1b
- feature_jsa_security_group1_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - feature_jsa_security_group1_test_resourceGroup
- disk.device.usage_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.usage_server_nested2_ps_1b
- disk.ephemeral.size_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.ephemeral.size_pd_server_main_1b
- disk.root.size_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.root.size_cmaui_1c1_main
- disk.iops_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_nested2_1c1_cmaui_2
- memory_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - memory_server_pd_pattern4
- feature_jsa_security_group2_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - feature_jsa_security_group2_test_nested3Level
- network.incoming.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes.rate_ps_server_nested2_1b_port
- disk.allocation_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.allocation_server_pd_pattern4
- cpu_util_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - cpu_util_cmaui_1c1_main
- disk.device.write.requests.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.write.requests.rate_cmaui_1c1_main
- network.outgoing.bytes.rate_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
- instance_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - instance_cmaui_1c1_main
- network.outgoing.packets.rate_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port
- disk.device.iops_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.iops_cmaui_1c1_main
- network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.bytes.rate_pd_server_pattern4_port_01
- network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- forwarder_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - forwarder_pd_server_main_1b_pd_server_main_1b_port
- network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.incoming.packets_pd_server_pattern4_port_02
- disk.write.requests.rate_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.write.requests.rate_ps_server_main_1b
- disk.allocation_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_nested2_ps_1b
- feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- network.outpoing.packets_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_cmaui_port_2
- cpu.delta_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - cpu.delta_cmaui_1c1_main
- network.outgoing.bytes_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes_cmaui_port_1
- feature_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - feature_server_nested2_ps_1b
- network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outgoing.bytes.rate_pd_server_pattern4_port_01
- network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- vcpus_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - vcpus_server_nested2_1c1_cmaui_2
- disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.read.bytes.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.read.bytes.rate_cmaui_1c1_main
- disk.device.write.requests.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.write.requests.rate_cmaui_1c1_main
- disk.iops_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.iops_ps_server_main_1b
- disk.device.iops_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_nested2_pd_1b
- endpoint_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - endpoint_server_pd_pattern4
- cpu_util_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - cpu_util_cmaui_1c1_main
- disk.device.allocation_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_nested2_pd_1b
- disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2
- network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_ps_server_nested2_1b_port
- binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - binding_pd_server_pattern4_port_01
- network.incoming.packets_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.incoming.packets_cmaui_1c1_main_cmaui_port
- network.incoming.packets_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.incoming.packets_cmaui_1c1_main_cmaui_port
- network.incoming.bytes.rate_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port
- disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_nested2_1c1_cmaui_1
- cpu_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - cpu_cmaui_1c1_main
- disk.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_nested2_1c1_cmaui_2
- network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - network.outpoing.packets_pd_server_pattern4_port_02
- vcpus_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - vcpus_server_pd_pattern4
- host_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - host_server_nested2_1c1_cmaui_1
- disk.write.requests_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.write.requests_cmaui_1c1_main
- memory.usage_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - memory.usage_cmaui_1c1_main
- memory_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - memory_server_nested2_ps_1b
- endpoint_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - endpoint_ps_server_main_1b
- network.outpoing.packets_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_cmaui_port_1
- feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.iops_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_nested2_pd_1b
- disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.read.bytes.rate_server_pd_pattern4
- disk.capacity_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.capacity_cmaui_1c1_main
- instance_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - instance_server_nested2_ps_1b
- disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.read.requests_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.read.requests_ps_server_main_1b
- network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- network.outgoing.bytes_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port
- disk.device.iops_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.iops_server_nested2_ps_1b
- disk.read.requests_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_nested2_pd_1b
- cpu.delta_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - cpu.delta_pd_server_main_1b
- disk.capacity_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.capacity_server_pd_pattern4
- network.outgoing.bytes_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port
- instance_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - instance_server_nested2_1c1_cmaui_1
- feature_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - feature_test_nested_pattern_4_nested2
- memory_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - memory_cmaui_1c1_main
- disk.write.bytes_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.write.bytes_ps_server_main_1b
- disk.write.requests.rate_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.write.requests.rate_pd_server_main_1b
- cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2
- attachment_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - attachment_cmaui_port_1
- binding_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - binding_ps_server_main_1b
- disk.capacity_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.capacity_cmaui_1c1_main
- disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.write.requests.rate_server_pd_pattern4
- os_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - os_cmaui_1c1_main
- disk.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_nested2_1c1_cmaui_1
- host_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - host_server_nested2_1c1_cmaui_2
- disk.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.read.bytes_server_nested2_1c1_cmaui_2
- disk.device.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_nested2_1c1_cmaui_1
- network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_cmaui_port_1
- disk.device.iops_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.iops_ps_server_main_1b
- disk.write.bytes_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.write.bytes_pd_server_main_1b
- disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- binding_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - binding_server_nested2_1c1_cmaui_1
- memory_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - memory_cmaui_1c1_main
- attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - attachment_pd_server_pattern4_port_01
- disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.bytes.rate_server_nested2_ps_1b
- disk.device.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_nested2_1c1_cmaui_1
- feature_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - feature_server_nested2_1c1_cmaui_1
- disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.read.bytes.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.read.bytes.rate_cmaui_1c1_main
- attachment_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - attachment_cmaui_port_2
- disk.device.write.bytes.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.device.write.bytes.rate_cmaui_1c1_main
- endpoint_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - endpoint_server_nested2_pd_1b
- memory_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - memory_pd_server_main_1b
- network.incoming.bytes.rate_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port
- disk.device.read.requests_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.read.requests_pd_server_main_1b
- disk.read.requests_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.read.requests_cmaui_1c1_main
- disk.device.capacity_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_nested2_pd_1b
- feature_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - feature_cmaui_1c1_main_cmaui_port
- feature_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - feature_cmaui_1c1_main_cmaui_port
- network.incoming.bytes.rate_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
- network.incoming.bytes.rate_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port
- disk.device.iops_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.iops_pd_server_main_1b
- os_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - os_cmaui_1c1_main
- disk.latency_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.latency_server_pd_pattern4
- memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- attachment_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - attachment_pd_server_nested2_1b_port
- disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- feature_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - feature_cmaui_port_2
- disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_nested2_ps_1b
- cpu_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - cpu_ps_server_main_1b
- scalable_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - scalable_pd_server_main_1b
- memory.usage_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_nested2_1c1_cmaui_2
- memory.usage_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - memory.usage_cmaui_1c1_main
- disk.read.bytes.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.read.bytes.rate_cmaui_1c1_main
- network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.write.requests_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.write.requests_cmaui_1c1_main
- disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- cpu_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - cpu_server_nested2_1c1_cmaui_1
- disk.usage_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_nested2_pd_1b
- disk.device.read.bytes_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes_server_nested2_ps_1b
- disk.device.write.bytes.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.device.write.bytes.rate_cmaui_1c1_main
- feature_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - feature_pd_server_nested2_1b_port
- network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- binding_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - binding_cmaui_port_2
- memory_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - memory_ps_server_main_1b
- disk.read.bytes_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.read.bytes_ps_server_main_1b
- vcpus_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - vcpus_ps_server_main_1b
- instance_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - instance_server_nested2_pd_1b
- disk.device.read.bytes_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.read.bytes_ps_server_main_1b
- disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.read.requests_server_pd_pattern4
- disk.write.bytes.rate_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - disk.write.bytes.rate_cmaui_1c1_main
- network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2
- feature_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - feature_server_pd_pattern4
- scalable_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - scalable_server_nested2_1c1_cmaui_2
- disk.device.usage_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.device.usage_pd_server_main_1b
- memory_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - memory_server_nested2_pd_1b
- binding_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - binding_pd_server_nested2_1b_port
- feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- disk.device.write.bytes_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.write.bytes_ps_server_main_1b
- vcpus_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - vcpus_cmaui_1c1_main
- network.incoming.packets_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_ps_server_nested2_1b_port
- disk.device.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.usage_server_pd_pattern4
- cpu_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - cpu_server_nested2_1c1_cmaui_2
- disk.write.requests_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_nested2_pd_1b
- memory.usage_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - memory.usage_server_pd_pattern4
- disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_nested2_pd_1b
- disk.usage_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.usage_pd_server_main_1b
- disk.write.bytes.rate_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - disk.write.bytes.rate_cmaui_1c1_main
- binding_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - binding_ps_server_nested2_1b_port
- cpu_util_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - cpu_util_server_nested2_pd_1b
- scalable_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - scalable_server_nested2_ps_1b
- disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- memory_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - memory_server_nested2_1c1_cmaui_1
- network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2
- scalable_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - scalable_server_nested2_1c1_cmaui_1
- disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.write.bytes_server_pd_pattern4
- disk.iops_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.iops_server_nested2_ps_1b
- memory.resident_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - memory.resident_server_nested2_ps_1b
- cpu.delta_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_nested2_pd_1b
- memory.usage_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - memory.usage_server_nested2_1c1_cmaui_1
- forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- disk.device.allocation_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.allocation_server_nested2_ps_1b
- attachment_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - attachment_ps_server_nested2_1b_port
- disk.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.read.requests_server_nested2_1c1_cmaui_1
- disk.device.write.requests_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.device.write.requests_ps_server_main_1b
- disk.allocation_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - disk.allocation_ps_server_main_1b
- disk.latency_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - disk.latency_pd_server_main_1b
- disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- disk.device.capacity_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.device.capacity_server_nested2_1c1_cmaui_1
- disk.device.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - disk.device.write.bytes_server_nested2_1c1_cmaui_2
- disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - disk.device.write.bytes.rate_server_pd_pattern4
- disk.device.latency_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - disk.device.latency_server_nested2_pd_1b
- endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - endpoint_server_pd_pattern4_test_nested_pattern_4_nested2
- disk.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - disk.write.requests_server_nested2_1c1_cmaui_1
- disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2
- network.outgoing.packets.rate_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
- binding_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - binding_cmaui_1c1_main_cmaui_port
- network.outgoing.packets.rate_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port
- binding_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - binding_cmaui_1c1_main_cmaui_port
- network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- os_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - os_server_nested2_1c1_cmaui_1
- binding_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - binding_server_nested2_ps_1b
- disk.write.requests.rate_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - disk.write.requests.rate_server_nested2_ps_1b
- attachment_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - attachment_cmaui_1c1_main_cmaui_port
- attachment_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - attachment_cmaui_1c1_main_cmaui_port
- feature_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - feature_test_resourceGroup
- disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2
- feature_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - feature_cmaui_port_1
- disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - cpu.delta_server_nested2_1c1_cmaui_1
- network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- network.incoming.packets_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - network.incoming.packets_cmaui_port_1
- disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2
- requirements:
- dependency_jsa_security_group2_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - dependency_jsa_security_group2_test_resourceGroup
- link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - link_pd_server_pattern4_port_01
- dependency_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - dependency_cmaui_port_2
- dependency_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - dependency_server_nested2_1c1_cmaui_1
- port_jsa_security_group1_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - port_jsa_security_group1_test_nested3Level
- link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - link_pd_server_pattern4_port_02
- dependency_test_nested2Level:
- - test_nested2Level
- - dependency
- dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - dependency_pd_server_pattern4_port_02
- local_storage_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - local_storage_ps_server_main_1b
- dependency_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - dependency_cmaui_1c1_main_cmaui_port
- dependency_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - dependency_pd_server_main_1b
- dependency_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - dependency_cmaui_1c1_main
- dependency_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - dependency_cmaui_1c1_main_cmaui_port
- dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - dependency_pd_server_pattern4_port_01
- local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2
- local_storage_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - local_storage_server_nested2_1c1_cmaui_2
- local_storage_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - local_storage_server_nested2_pd_1b
- local_storage_server_nested2_1c1_cmaui_1_test_nested2Level:
- - test_nested2Level
- - local_storage_server_nested2_1c1_cmaui_1
- local_storage_server_main_pd_1b_1:
- - abstract_pd_server_main_1b
- - local_storage_pd_server_main_1b
- dependency_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - dependency_test_resourceGroup
- link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- dependency_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - dependency_pd_server_nested2_1b_port
- dependency_server_nested2_1c1_cmaui_2_test_nested2Level:
- - test_nested2Level
- - dependency_server_nested2_1c1_cmaui_2
- link_pd_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - link_pd_server_nested2_1b_port
- dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - dependency_server_pd_pattern4_test_nested_pattern_4_nested2
- dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- dependency_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - dependency_cmaui_port_1
- local_storage_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - local_storage_server_pd_pattern4
- dependency_server_main_ps_1b_1:
- - abstract_ps_server_main_1b
- - dependency_ps_server_main_1b
- dependency_server_nested2_pd_1b_test_nested2Level:
- - test_nested2Level
- - dependency_server_nested2_pd_1b
- dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file
- dependency_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - dependency_server_nested2_ps_1b
- dependency_jsa_security_group1_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - dependency_jsa_security_group1_test_nested3Level
- link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file
- local_storage_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - local_storage_cmaui_1c1_main
- dependency_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - dependency_pd_server_main_1b_pd_server_main_1b_port
- link_cmaui_port_11:
- - abstract_cmaui_1c1_main
- - link_cmaui_1c1_main_cmaui_port
- dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2
- link_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - link_ps_server_main_1b_ps_server_main_1b_port
- dependency_jsa_security_group1_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - dependency_jsa_security_group1_test_resourceGroup
- dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2
- link_cmaui_port_2_test_nested2Level:
- - test_nested2Level
- - link_cmaui_port_2
- link_cmaui_port_12:
- - abstract_cmaui_1c1_main
- - link_cmaui_1c1_main_cmaui_port
- dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - dependency_test_nested_pattern_4_same_type_diff_file
- link_pd_server_main_1b_port_1:
- - abstract_pd_server_main_1b
- - link_pd_server_main_1b_pd_server_main_1b_port
- link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level:
- - test_nested2Level
- - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file
- port_jsa_security_group2_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - port_jsa_security_group2_test_resourceGroup
- port_jsa_security_group2_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - port_jsa_security_group2_test_nested3Level
- dependency_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - dependency
- dependency_jsa_security_group2_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - dependency_jsa_security_group2_test_nested3Level
- dependency_server_pd_pattern4_test_nested_pattern_4_main_1:
- - test_nested_pattern_4_main_1
- - dependency_server_pd_pattern4
- link_cmaui_port_1_test_nested2Level:
- - test_nested2Level
- - link_cmaui_port_1
- local_storage_server_main_1c1_cmaui_21:
- - abstract_cmaui_1c1_main
- - local_storage_cmaui_1c1_main
- local_storage_server_nested2_ps_1b_test_nested2Level:
- - test_nested2Level
- - local_storage_server_nested2_ps_1b
- dependency_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - dependency_ps_server_nested2_1b_port
- link_ps_server_nested2_1b_port_test_nested2Level:
- - test_nested2Level
- - link_ps_server_nested2_1b_port
- dependency_server_main_1c1_cmaui_11:
- - abstract_cmaui_1c1_main
- - dependency_cmaui_1c1_main
- dependency_ps_server_main_1b_port_1:
- - abstract_ps_server_main_1b
- - dependency_ps_server_main_1b_ps_server_main_1b_port
- port_jsa_security_group1_test_resourceGroup_test_nested2Level:
- - test_nested2Level
- - port_jsa_security_group1_test_resourceGroup
- dependency_test_nested_pattern_4_nested2_test_nested2Level:
- - test_nested2Level
- - dependency_test_nested_pattern_4_nested2
- dependency_test_nested3Level_test_nested2Level:
- - test_nested2Level
- - dependency_test_nested3Level
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + ps_server_main_1b_image: + hidden: false + immutable: false + type: string + description: Ps Image server + security_group_name: + hidden: false + immutable: false + type: string + description: security_group_name + cmaui_1c1_main_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + contrail_net_name: + hidden: false + immutable: false + type: string + description: network name of contrail v2 network + ps_server_main_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PS server + ps_server_main_1b_ips: + hidden: false + immutable: false + type: string + jsa_net_name: + hidden: false + immutable: false + type: string + description: network name of jsa network + jsa_name: + hidden: false + immutable: false + type: string + description: network name of jsa log network + pd_server_main_1b_names: + hidden: false + immutable: false + type: list + description: PD server names + entry_schema: + type: string + cmaui_1c1_main_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + pd_server_main_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + cmaui_1c1_main_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + ps_server_main_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + name: + hidden: false + immutable: false + type: string + description: nested parameter + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + cmaui_oam_ips: + hidden: false + immutable: false + type: string + pd_server_main_1b_image: + hidden: false + immutable: false + type: string + description: PD Image server + pd_server_main_1b_ips: + hidden: false + immutable: false + type: string + node_templates: + test_nested_pattern_4_main_1: + type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 + directives: + - substitutable + properties: + p1: + get_input: jsa_name + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + port_pd_server_pattern4_port_01_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_02_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_pattern4_port_02_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + abstract_ps_server_main_1b: + type: org.openecomp.resource.abstract.nodes.ps_server_main_1b + directives: + - substitutable + properties: + port_ps_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_main_1b_ips + - 0 + port_ps_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_ps_server_main_1b_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: ps_server_main_1b_flavor + port_ps_server_main_1b_port_subinterface_indicator: + - true + vm_image_name: + get_input: ps_server_main_1b_image + compute_ps_server_main_1b_name: + - get_input: + - ps_server_main_1b_names + - 1 + port_ps_server_main_1b_port_replacement_policy: + - AUTO + port_ps_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_main_1b_port_network: + - get_input: jsa_name + service_template_filter: + substitute_service_template: Nested_ps_server_main_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_cmaui_1c1_main: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1_main + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - get_input: contrail_net_name + - get_input: contrail_net_name + port_cmaui_port_network_role_tag: contrail + vm_flavor_name: + get_input: cmaui_1c1_main_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_main_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_main_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_port_subinterface_indicator: + - true + - true + compute_cmaui_1c1_main_name: + - get_input: + - cmaui_1c1_main_names + - 0 + - get_input: + - cmaui_1c1_main_names + - 1 + service_template_filter: + substitute_service_template: Nested_cmaui_1c1_mainServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_pd_server_main_1b: + type: org.openecomp.resource.abstract.nodes.pd_server_main_1b + directives: + - substitutable + properties: + port_pd_server_main_1b_port_subinterface_indicator: + - true + compute_pd_server_main_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_main_1b_port_replacement_policy: + - AUTO + port_pd_server_main_1b_port_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_main_1b_flavor + vm_image_name: + get_input: pd_server_main_1b_image + compute_pd_server_main_1b_name: + - get_input: + - pd_server_main_1b_names + - 0 + port_pd_server_main_1b_port_network: + - get_input: jsa_name + port_pd_server_main_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_main_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_main_1b_ips + - 0 + service_template_filter: + substitute_service_template: Nested_pd_server_main_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_nested2Level: + type: org.openecomp.resource.abstract.nodes.heat.nested2 + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested2ServiceTemplate.yaml + name: + get_input: security_group_name + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - test_nested_pattern_4_main_1 + - test_nested2Level + - abstract_pd_server_main_1b + - abstract_ps_server_main_1b + - abstract_cmaui_1c1_main + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + capabilities: + feature_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_server_pd_pattern4_test_nested_pattern_4_nested2 + instance_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - instance_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.ephemeral.size_server_pd_pattern4 + disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2 + feature_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_test_nested_pattern_4_same_type_diff_file + disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.packets_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.incoming.packets_cmaui_port_2 + network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_port_01 + cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.read.requests_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.read.requests_cmaui_1c1_main + disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.read.bytes_server_pd_pattern4 + disk.latency_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.latency_server_nested2_1c1_cmaui_2 + disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + binding_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main + cpu_util_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - cpu_util_server_pd_pattern4 + disk.ephemeral.size_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_nested2_pd_1b + host_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - host_server_nested2_pd_1b + disk.device.latency_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.latency_ps_server_main_1b + feature_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - feature_server_nested2_pd_1b + disk.device.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_nested2_1c1_cmaui_2 + cpu_util_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - cpu_util_pd_server_main_1b + disk.latency_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.latency_server_nested2_1c1_cmaui_1 + disk.device.latency_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.latency_pd_server_main_1b + disk.device.write.requests_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_nested2_ps_1b + disk.device.read.requests_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.read.requests_cmaui_1c1_main + feature_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.allocation_server_pd_pattern4 + disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_port_02 + attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.device.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_nested2_pd_1b + network.incoming.bytes_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.incoming.bytes_pd_server_main_1b_pd_server_main_1b_port + network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_port_02 + disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.read.requests_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_nested2_ps_1b + disk.root.size_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.root.size_server_nested2_ps_1b + forwarder_cmaui_port_11: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_port + disk.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_nested2_1c1_cmaui_2 + forwarder_cmaui_port_12: + - abstract_cmaui_1c1_main + - forwarder_cmaui_1c1_main_cmaui_port + feature_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - feature_ps_server_main_1b_ps_server_main_1b_port + vcpus_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - vcpus_pd_server_main_1b + disk.device.usage_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_nested2_pd_1b + disk.usage_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.usage_server_nested2_ps_1b + forwarder_cmaui_port_2_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_2 + os_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - os_server_pd_pattern4 + disk.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_nested2_1c1_cmaui_1 + disk.device.capacity_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_nested2_ps_1b + memory.resident_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - memory.resident_server_nested2_pd_1b + network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_port_02 + disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.write.bytes.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.write.bytes.rate_pd_server_main_1b + instance_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - instance_pd_server_main_1b + disk.read.bytes.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.read.bytes.rate_ps_server_main_1b + feature_test_nested2Level: + - test_nested2Level + - feature + disk.read.bytes.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.read.bytes.rate_pd_server_main_1b + cpu.delta_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu.delta_server_nested2_1c1_cmaui_2 + disk.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.read.requests_server_pd_pattern4 + disk.write.bytes_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_nested2_ps_1b + network.outgoing.bytes.rate_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.outgoing.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + disk.ephemeral.size_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_nested2_1c1_cmaui_1 + memory_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - memory_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.outgoing.packets.rate_ps_server_main_1b_ps_server_main_1b_port + network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + binding_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main + network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_port_02 + disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_nested2_pd_1b + attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + cpu_util_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - cpu_util_server_nested2_ps_1b + instance_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - instance_ps_server_main_1b + network.outgoing.packets.rate_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_ps_server_nested2_1b_port + network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + memory.usage_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - memory.usage_server_nested2_ps_1b + disk.capacity_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.capacity_server_nested2_1c1_cmaui_2 + disk.write.requests_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_nested2_1c1_cmaui_2 + disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.allocation_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.allocation_pd_server_main_1b + endpoint_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - endpoint_cmaui_1c1_main + host_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - host_server_pd_pattern4 + disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.usage_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.usage_cmaui_1c1_main + network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.device.write.requests_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.write.requests_pd_server_main_1b + cpu_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - cpu_server_pd_pattern4 + feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2 + host_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - host_pd_server_main_1b + feature_jsa_security_group2_test_resourceGroup_test_nested2Level: + - test_nested2Level + - feature_jsa_security_group2_test_resourceGroup + memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets.rate_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_port_1 + cpu.delta_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - cpu.delta_ps_server_main_1b + binding_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_server_pd_pattern4 + cpu_util_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - cpu_util_ps_server_main_1b + disk.write.bytes_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.write.bytes_cmaui_1c1_main + network.incoming.bytes_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_nested2_1b_port + disk.usage_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.usage_cmaui_1c1_main + network.incoming.packets.rate_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_cmaui_port_2 + disk.device.write.bytes.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.write.bytes.rate_ps_server_main_1b + cpu_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - cpu_server_nested2_ps_1b + binding_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_port_02 + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.root.size_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.root.size_server_nested2_1c1_cmaui_1 + forwarder_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - forwarder_ps_server_main_1b_ps_server_main_1b_port + binding_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - binding_ps_server_main_1b_ps_server_main_1b_port + feature_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature_pd_server_pattern4_port_01 + network.outgoing.bytes.rate_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port + disk.read.bytes_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_nested2_pd_1b + network.outgoing.bytes.rate_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.outgoing.bytes.rate_cmaui_1c1_main_cmaui_port + network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + os_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - os_ps_server_main_1b + disk.device.read.bytes_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.read.bytes_pd_server_main_1b + attachment_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - attachment_ps_server_main_1b_ps_server_main_1b_port + cpu.delta_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - cpu.delta_server_nested2_ps_1b + feature_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - feature_ps_server_nested2_1b_port + disk.latency_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.latency_cmaui_1c1_main + disk.write.bytes_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.write.bytes_cmaui_1c1_main + disk.write.requests.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_nested2_pd_1b + disk.device.read.bytes.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.read.bytes.rate_pd_server_main_1b + network.outgoing.bytes_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_ps_server_nested2_1b_port + network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + feature_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - feature_server_nested2_1c1_cmaui_2 + endpoint_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - endpoint_cmaui_1c1_main + network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.read.bytes.rate_server_pd_pattern4 + disk.device.iops_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_nested2_1c1_cmaui_1 + feature_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - feature_ps_server_main_1b + network.outpoing.packets_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.outpoing.packets_ps_server_main_1b_ps_server_main_1b_port + disk.device.read.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_nested2_1c1_cmaui_1 + disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes.rate_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_nested2_1b_port + binding_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - binding_server_nested2_pd_1b + disk.latency_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.latency_cmaui_1c1_main + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.root.size_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.root.size_server_pd_pattern4 + binding_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - binding_server_nested2_1c1_cmaui_2 + network.outgoing.packets.rate_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_port_1 + disk.device.write.bytes_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.write.bytes_pd_server_main_1b + binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1 + disk.ephemeral.size_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.ephemeral.size_ps_server_main_1b + disk.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.allocation_server_nested2_1c1_cmaui_1 + disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.iops_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.iops_cmaui_1c1_main + network.outgoing.bytes_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_cmaui_port_2 + forwarder_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_nested2_1b_port + network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.read.bytes.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.read.bytes.rate_ps_server_main_1b + disk.device.usage_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.usage_cmaui_1c1_main + disk.usage_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.usage_server_nested2_1c1_cmaui_2 + disk.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_nested2_1c1_cmaui_2 + disk.device.read.bytes.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.read.bytes.rate_cmaui_1c1_main + network.outgoing.bytes.rate_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_port_2 + disk.device.write.requests.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.write.requests.rate_pd_server_main_1b + network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.iops_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.iops_server_pd_pattern4 + network.incoming.packets.rate_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.incoming.packets.rate_ps_server_main_1b_ps_server_main_1b_port + binding_cmaui_port_1_test_nested2Level: + - test_nested2Level + - binding_cmaui_port_1 + disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + memory.usage_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - memory.usage_pd_server_main_1b + disk.root.size_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.root.size_ps_server_main_1b + network.incoming.packets_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.incoming.packets_pd_server_main_1b_pd_server_main_1b_port + network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_port_02 + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2 + disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2 + scalable_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - scalable_cmaui_1c1_main + disk.device.read.requests.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_nested2_ps_1b + disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.write.bytes.rate_server_pd_pattern4 + disk.iops_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.iops_cmaui_1c1_main + os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.usage_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.usage_server_nested2_1c1_cmaui_1 + network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_port_02 + disk.capacity_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.capacity_pd_server_main_1b + disk.device.write.requests_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.write.requests_cmaui_1c1_main + disk.read.requests_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.read.requests_pd_server_main_1b + disk.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.allocation_server_nested2_1c1_cmaui_2 + disk.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_nested2_1c1_cmaui_1 + network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes_pd_server_pattern4_port_01 + network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.iops_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.iops_server_nested2_1c1_cmaui_1 + network.outgoing.bytes.rate_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_nested2_1b_port + disk.write.requests_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_nested2_ps_1b + disk.write.requests_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.write.requests_pd_server_main_1b + disk.device.write.requests.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_nested2_ps_1b + instance_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - instance_server_nested2_1c1_cmaui_2 + network.outpoing.packets_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_nested2_1b_port + disk.latency_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.latency_ps_server_main_1b + os_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - os_server_nested2_pd_1b + disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.read.bytes_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.read.bytes_pd_server_main_1b + disk.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.write.requests_server_pd_pattern4 + disk.device.read.bytes.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_nested2_pd_1b + cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.write.requests.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.write.requests.rate_ps_server_main_1b + disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.latency_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_nested2_1c1_cmaui_2 + network.incoming.bytes_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_ps_server_nested2_1b_port + feature_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature_pd_server_pattern4_port_02 + network.outgoing.packets.rate_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_cmaui_port_2 + network.outgoing.bytes_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_port + endpoint_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - endpoint_pd_server_main_1b + disk.allocation_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.allocation_cmaui_1c1_main + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outgoing.bytes_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.outgoing.bytes_cmaui_1c1_main_cmaui_port + vcpus_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - vcpus_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.write.bytes_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_nested2_pd_1b + network.incoming.packets.rate_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_ps_server_nested2_1b_port + network.incoming.packets.rate_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_nested2_1b_port + endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1 + cpu.delta_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - cpu.delta_server_pd_pattern4 + disk.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_nested2_1c1_cmaui_1 + network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + scalable_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - scalable_server_nested2_pd_1b + network.incoming.packets_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.incoming.packets_ps_server_main_1b_ps_server_main_1b_port + binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + network.incoming.packets.rate_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.incoming.packets.rate_pd_server_main_1b_pd_server_main_1b_port + forwarder_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - forwarder_ps_server_nested2_1b_port + network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.device.usage_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.usage_cmaui_1c1_main + disk.capacity_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.capacity_server_nested2_ps_1b + binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + host_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - host_ps_server_main_1b + disk.root.size_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.root.size_pd_server_main_1b + memory.usage_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - memory.usage_ps_server_main_1b + network.outpoing.packets_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_ps_server_nested2_1b_port + instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + os_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - os_server_nested2_ps_1b + scalable_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - scalable_ps_server_main_1b + disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.capacity_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.capacity_cmaui_1c1_main + disk.device.read.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_nested2_1c1_cmaui_2 + host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + memory.resident_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - memory.resident_ps_server_main_1b + os_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - os_pd_server_main_1b + disk.device.read.bytes_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.read.bytes_cmaui_1c1_main + disk.latency_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.latency_server_nested2_ps_1b + disk.root.size_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.root.size_server_nested2_1c1_cmaui_2 + binding_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - binding_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes_pd_server_pattern4_port_01 + memory.resident_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - memory.resident_server_nested2_1c1_cmaui_1 + vcpus_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - vcpus_server_nested2_ps_1b + disk.device.iops_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_nested2_1c1_cmaui_2 + network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.write.requests_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.write.requests_ps_server_main_1b + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_port_02 + memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.allocation_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.allocation_cmaui_1c1_main + feature_jsa_security_group1_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_jsa_security_group1_test_nested3Level + disk.device.read.requests_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.read.requests_ps_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.read.bytes_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.read.bytes_cmaui_1c1_main + disk.capacity_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.capacity_server_nested2_1c1_cmaui_1 + disk.write.requests.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.write.requests.rate_cmaui_1c1_main + disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.allocation_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.allocation_cmaui_1c1_main + disk.device.read.bytes_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_nested2_pd_1b + disk.device.allocation_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.allocation_cmaui_1c1_main + disk.capacity_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.capacity_ps_server_main_1b + binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.read.requests_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_nested2_ps_1b + cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.read.bytes_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_nested2_ps_1b + network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + scalable_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - scalable_server_pd_pattern4 + disk.device.latency_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.latency_server_pd_pattern4 + disk.write.requests.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.write.requests.rate_cmaui_1c1_main + scalable_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - scalable_cmaui_1c1_main + disk.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_nested2_1c1_cmaui_2 + disk.device.write.requests_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.write.requests_cmaui_1c1_main + disk.device.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_nested2_1c1_cmaui_1 + instance_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - instance_server_pd_pattern4 + disk.allocation_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.allocation_server_nested2_pd_1b + feature_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - forwarder_pd_server_pattern4_port_01 + disk.device.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_nested2_1c1_cmaui_2 + disk.device.capacity_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.capacity_cmaui_1c1_main + scalable_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - scalable_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.write.bytes.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.write.bytes.rate_pd_server_main_1b + feature_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_test_nested3Level + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.iops_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.iops_pd_server_main_1b + disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.ephemeral.size_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_nested2_1c1_cmaui_2 + feature_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - feature_pd_server_main_1b + network.incoming.bytes_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_port + network.incoming.bytes_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.incoming.bytes_cmaui_1c1_main_cmaui_port + scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + forwarder_cmaui_port_1_test_nested2Level: + - test_nested2Level + - forwarder_cmaui_port_1 + disk.latency_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.latency_server_nested2_pd_1b + memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + cpu.delta_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - cpu.delta_cmaui_1c1_main + disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.write.requests.rate_server_pd_pattern4 + disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.write.requests_server_pd_pattern4 + disk.device.write.bytes_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.write.bytes_cmaui_1c1_main + disk.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_nested2_1c1_cmaui_2 + cpu_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - cpu_server_nested2_pd_1b + network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.packets.rate_pd_server_pattern4_port_01 + disk.device.allocation_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_nested2_1c1_cmaui_2 + disk.device.allocation_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.allocation_pd_server_main_1b + disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.read.bytes_server_pd_pattern4 + vcpus_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - vcpus_server_nested2_pd_1b + disk.device.usage_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_nested2_1c1_cmaui_1 + network.incoming.bytes_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_cmaui_port_1 + disk.device.latency_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.latency_cmaui_1c1_main + disk.device.allocation_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_nested2_1c1_cmaui_1 + vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + cpu_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - cpu_cmaui_1c1_main + endpoint_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - endpoint_server_nested2_1c1_cmaui_2 + disk.write.bytes.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.write.bytes.rate_ps_server_main_1b + disk.device.read.requests.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.read.requests.rate_pd_server_main_1b + feature_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature + memory.usage_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - memory.usage_server_nested2_pd_1b + disk.device.write.bytes_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_nested2_pd_1b + disk.device.capacity_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.capacity_ps_server_main_1b + network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets.rate_pd_server_pattern4_port_01 + disk.device.write.bytes_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.write.bytes_cmaui_1c1_main + network.incoming.bytes_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_cmaui_port_2 + binding_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - binding_pd_server_main_1b_pd_server_main_1b_port + disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.write.bytes_server_pd_pattern4 + disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2 + memory.resident_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - memory.resident_pd_server_main_1b + network.incoming.bytes_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.incoming.bytes_ps_server_main_1b_ps_server_main_1b_port + vcpus_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - vcpus_server_nested2_1c1_cmaui_1 + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.read.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_nested2_1c1_cmaui_1 + disk.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_nested2_ps_1b + endpoint_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - endpoint_server_nested2_1c1_cmaui_1 + attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.iops_server_pd_pattern4 + network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.device.read.requests_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_nested2_pd_1b + attachment_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_port_02 + memory.resident_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - memory.resident_server_pd_pattern4 + feature_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - feature_pd_server_main_1b_pd_server_main_1b_port + host_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - host_cmaui_1c1_main + network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.ephemeral.size_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_nested2_ps_1b + disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_nested2_1b_port + network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + disk.device.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes.rate_server_nested2_ps_1b + disk.device.usage_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.usage_ps_server_main_1b + network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.device.capacity_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_nested2_1c1_cmaui_2 + disk.device.write.requests_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_nested2_pd_1b + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + disk.device.usage_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_nested2_1c1_cmaui_2 + disk.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_nested2_1c1_cmaui_1 + network.incoming.bytes.rate_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_cmaui_port_2 + disk.device.latency_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.latency_cmaui_1c1_main + disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + network.incoming.packets.rate_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port + network.incoming.packets.rate_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.incoming.packets.rate_cmaui_1c1_main_cmaui_port + disk.device.read.requests.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.requests.rate_server_nested2_pd_1b + disk.device.allocation_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.allocation_ps_server_main_1b + vcpus_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - vcpus_cmaui_1c1_main + attachment_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - attachment_pd_server_main_1b_pd_server_main_1b_port + disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.incoming.bytes.rate_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_cmaui_port_1 + os_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - os_server_nested2_1c1_cmaui_2 + disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + memory.resident_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - memory.resident_cmaui_1c1_main + network.incoming.packets_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_nested2_1b_port + disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outpoing.packets_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_port + binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + network.outpoing.packets_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.outpoing.packets_cmaui_1c1_main_cmaui_port + disk.usage_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.usage_server_pd_pattern4 + memory.resident_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - memory.resident_server_nested2_1c1_cmaui_2 + disk.capacity_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.capacity_server_nested2_pd_1b + disk.ephemeral.size_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.ephemeral.size_cmaui_1c1_main + cpu_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - cpu_server_pd_pattern4_test_nested_pattern_4_nested2 + binding_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - binding_pd_server_main_1b + memory.resident_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - memory.resident_cmaui_1c1_main + disk.device.read.requests.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.read.requests.rate_cmaui_1c1_main + disk.device.capacity_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.capacity_pd_server_main_1b + disk.read.bytes_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.read.bytes_cmaui_1c1_main + os_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - os_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_nested2_1c1_cmaui_1 + host_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - host_server_nested2_ps_1b + host_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - host_server_pd_pattern4_test_nested_pattern_4_nested2 + cpu_util_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - cpu_util_server_nested2_1c1_cmaui_1 + network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.root.size_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.root.size_cmaui_1c1_main + disk.usage_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.usage_ps_server_main_1b + cpu_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - cpu_pd_server_main_1b + disk.read.requests_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.read.requests_cmaui_1c1_main + memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outgoing.packets.rate_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_nested2_1b_port + disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.read.requests.rate_server_pd_pattern4 + disk.ephemeral.size_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.ephemeral.size_cmaui_1c1_main + host_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - host_cmaui_1c1_main + disk.device.iops_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.iops_cmaui_1c1_main + disk.device.latency_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_nested2_ps_1b + disk.device.read.requests_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_nested2_1c1_cmaui_2 + cpu_util_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu_util_server_nested2_1c1_cmaui_2 + instance_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - instance_cmaui_1c1_main + memory_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - memory_server_nested2_1c1_cmaui_2 + disk.device.read.requests.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.read.requests.rate_ps_server_main_1b + disk.device.read.requests.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.read.requests.rate_cmaui_1c1_main + disk.read.bytes_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.read.bytes_cmaui_1c1_main + network.outpoing.packets_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.outpoing.packets_pd_server_main_1b_pd_server_main_1b_port + disk.write.bytes.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_nested2_pd_1b + disk.root.size_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.root.size_server_nested2_pd_1b + endpoint_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - endpoint_server_nested2_ps_1b + attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_port_01 + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2 + disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.capacity_server_pd_pattern4 + disk.device.read.bytes.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_nested2_ps_1b + feature_jsa_security_group1_test_resourceGroup_test_nested2Level: + - test_nested2Level + - feature_jsa_security_group1_test_resourceGroup + disk.device.usage_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.usage_server_nested2_ps_1b + disk.ephemeral.size_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.ephemeral.size_pd_server_main_1b + disk.root.size_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.root.size_cmaui_1c1_main + disk.iops_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.iops_server_nested2_1c1_cmaui_2 + memory_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - memory_server_pd_pattern4 + feature_jsa_security_group2_test_nested3Level_test_nested2Level: + - test_nested2Level + - feature_jsa_security_group2_test_nested3Level + network.incoming.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.bytes.rate_ps_server_nested2_1b_port + disk.allocation_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.allocation_server_pd_pattern4 + cpu_util_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - cpu_util_cmaui_1c1_main + disk.device.write.requests.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.write.requests.rate_cmaui_1c1_main + network.outgoing.bytes.rate_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.outgoing.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + instance_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - instance_cmaui_1c1_main + network.outgoing.packets.rate_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.outgoing.packets.rate_pd_server_main_1b_pd_server_main_1b_port + disk.device.iops_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.iops_cmaui_1c1_main + network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.bytes.rate_pd_server_pattern4_port_01 + network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + forwarder_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - forwarder_pd_server_main_1b_pd_server_main_1b_port + network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.incoming.packets_pd_server_pattern4_port_02 + disk.write.requests.rate_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.write.requests.rate_ps_server_main_1b + disk.allocation_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.allocation_server_nested2_ps_1b + feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + network.outpoing.packets_cmaui_port_2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_port_2 + cpu.delta_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - cpu.delta_cmaui_1c1_main + network.outgoing.bytes_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes_cmaui_port_1 + feature_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - feature_server_nested2_ps_1b + network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outgoing.bytes.rate_pd_server_pattern4_port_01 + network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + vcpus_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - vcpus_server_nested2_1c1_cmaui_2 + disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.read.bytes.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.read.bytes.rate_cmaui_1c1_main + disk.device.write.requests.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.write.requests.rate_cmaui_1c1_main + disk.iops_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.iops_ps_server_main_1b + disk.device.iops_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_nested2_pd_1b + endpoint_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - endpoint_server_pd_pattern4 + cpu_util_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - cpu_util_cmaui_1c1_main + disk.device.allocation_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_nested2_pd_1b + disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.bytes.rate_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_ps_server_nested2_1b_port + binding_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - binding_pd_server_pattern4_port_01 + network.incoming.packets_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_port + network.incoming.packets_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.incoming.packets_cmaui_1c1_main_cmaui_port + network.incoming.bytes.rate_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.incoming.bytes.rate_ps_server_main_1b_ps_server_main_1b_port + disk.device.latency_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_nested2_1c1_cmaui_1 + cpu_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - cpu_cmaui_1c1_main + disk.write.bytes.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_nested2_1c1_cmaui_2 + network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - network.outpoing.packets_pd_server_pattern4_port_02 + vcpus_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - vcpus_server_pd_pattern4 + host_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - host_server_nested2_1c1_cmaui_1 + disk.write.requests_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.write.requests_cmaui_1c1_main + memory.usage_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - memory.usage_cmaui_1c1_main + memory_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - memory_server_nested2_ps_1b + endpoint_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - endpoint_ps_server_main_1b + network.outpoing.packets_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_cmaui_port_1 + feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.iops_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.iops_server_nested2_pd_1b + disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.read.bytes.rate_server_pd_pattern4 + disk.capacity_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.capacity_cmaui_1c1_main + instance_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - instance_server_nested2_ps_1b + disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.read.requests_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.read.requests_ps_server_main_1b + network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + network.outgoing.bytes_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - network.outgoing.bytes_ps_server_main_1b_ps_server_main_1b_port + disk.device.iops_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.iops_server_nested2_ps_1b + disk.read.requests_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_nested2_pd_1b + cpu.delta_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - cpu.delta_pd_server_main_1b + disk.capacity_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.capacity_server_pd_pattern4 + network.outgoing.bytes_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.outgoing.bytes_pd_server_main_1b_pd_server_main_1b_port + instance_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - instance_server_nested2_1c1_cmaui_1 + feature_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - feature_test_nested_pattern_4_nested2 + memory_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - memory_cmaui_1c1_main + disk.write.bytes_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.write.bytes_ps_server_main_1b + disk.write.requests.rate_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.write.requests.rate_pd_server_main_1b + cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_cmaui_port_1_test_nested2Level: + - test_nested2Level + - attachment_cmaui_port_1 + binding_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - binding_ps_server_main_1b + disk.capacity_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.capacity_cmaui_1c1_main + disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.write.requests.rate_server_pd_pattern4 + os_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - os_cmaui_1c1_main + disk.write.bytes.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_nested2_1c1_cmaui_1 + host_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - host_server_nested2_1c1_cmaui_2 + disk.read.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.read.bytes_server_nested2_1c1_cmaui_2 + disk.device.write.requests.rate_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_nested2_1c1_cmaui_1 + network.outgoing.bytes.rate_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_cmaui_port_1 + disk.device.iops_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.iops_ps_server_main_1b + disk.write.bytes_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.write.bytes_pd_server_main_1b + disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + binding_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - binding_server_nested2_1c1_cmaui_1 + memory_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - memory_cmaui_1c1_main + attachment_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - attachment_pd_server_pattern4_port_01 + disk.write.bytes.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.write.bytes.rate_server_nested2_ps_1b + disk.device.write.bytes_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_nested2_1c1_cmaui_1 + feature_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - feature_server_nested2_1c1_cmaui_1 + disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.read.bytes.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.read.bytes.rate_cmaui_1c1_main + attachment_cmaui_port_2_test_nested2Level: + - test_nested2Level + - attachment_cmaui_port_2 + disk.device.write.bytes.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.device.write.bytes.rate_cmaui_1c1_main + endpoint_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - endpoint_server_nested2_pd_1b + memory_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - memory_pd_server_main_1b + network.incoming.bytes.rate_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - network.incoming.bytes.rate_pd_server_main_1b_pd_server_main_1b_port + disk.device.read.requests_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.read.requests_pd_server_main_1b + disk.read.requests_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.read.requests_cmaui_1c1_main + disk.device.capacity_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_nested2_pd_1b + feature_cmaui_port_12: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main_cmaui_port + feature_cmaui_port_11: + - abstract_cmaui_1c1_main + - feature_cmaui_1c1_main_cmaui_port + network.incoming.bytes.rate_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port + network.incoming.bytes.rate_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.incoming.bytes.rate_cmaui_1c1_main_cmaui_port + disk.device.iops_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.iops_pd_server_main_1b + os_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - os_cmaui_1c1_main + disk.latency_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.latency_server_pd_pattern4 + memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + attachment_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - attachment_pd_server_nested2_1b_port + disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + feature_cmaui_port_2_test_nested2Level: + - test_nested2Level + - feature_cmaui_port_2 + disk.device.write.bytes_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_nested2_ps_1b + cpu_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - cpu_ps_server_main_1b + scalable_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - scalable_pd_server_main_1b + memory.usage_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - memory.usage_server_nested2_1c1_cmaui_2 + memory.usage_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - memory.usage_cmaui_1c1_main + disk.read.bytes.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.read.bytes.rate_cmaui_1c1_main + network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.write.requests_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.write.requests_cmaui_1c1_main + disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + cpu_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - cpu_server_nested2_1c1_cmaui_1 + disk.usage_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.usage_server_nested2_pd_1b + disk.device.read.bytes_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes_server_nested2_ps_1b + disk.device.write.bytes.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.device.write.bytes.rate_cmaui_1c1_main + feature_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - feature_pd_server_nested2_1b_port + network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + binding_cmaui_port_2_test_nested2Level: + - test_nested2Level + - binding_cmaui_port_2 + memory_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - memory_ps_server_main_1b + disk.read.bytes_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.read.bytes_ps_server_main_1b + vcpus_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - vcpus_ps_server_main_1b + instance_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - instance_server_nested2_pd_1b + disk.device.read.bytes_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.read.bytes_ps_server_main_1b + disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.read.requests_server_pd_pattern4 + disk.write.bytes.rate_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - disk.write.bytes.rate_cmaui_1c1_main + network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2 + feature_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - feature_server_pd_pattern4 + scalable_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - scalable_server_nested2_1c1_cmaui_2 + disk.device.usage_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.device.usage_pd_server_main_1b + memory_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - memory_server_nested2_pd_1b + binding_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - binding_pd_server_nested2_1b_port + feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + disk.device.write.bytes_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.write.bytes_ps_server_main_1b + vcpus_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - vcpus_cmaui_1c1_main + network.incoming.packets_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - network.incoming.packets_ps_server_nested2_1b_port + disk.device.usage_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.usage_server_pd_pattern4 + cpu_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - cpu_server_nested2_1c1_cmaui_2 + disk.write.requests_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_nested2_pd_1b + memory.usage_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - memory.usage_server_pd_pattern4 + disk.device.write.requests.rate_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_nested2_pd_1b + disk.usage_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.usage_pd_server_main_1b + disk.write.bytes.rate_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - disk.write.bytes.rate_cmaui_1c1_main + binding_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - binding_ps_server_nested2_1b_port + cpu_util_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - cpu_util_server_nested2_pd_1b + scalable_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - scalable_server_nested2_ps_1b + disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + memory_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - memory_server_nested2_1c1_cmaui_1 + network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.device.write.requests.rate_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.requests.rate_server_nested2_1c1_cmaui_2 + scalable_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - scalable_server_nested2_1c1_cmaui_1 + disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.write.bytes_server_pd_pattern4 + disk.iops_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.iops_server_nested2_ps_1b + memory.resident_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - memory.resident_server_nested2_ps_1b + cpu.delta_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - cpu.delta_server_nested2_pd_1b + memory.usage_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - memory.usage_server_nested2_1c1_cmaui_1 + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + disk.device.allocation_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.device.allocation_server_nested2_ps_1b + attachment_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - attachment_ps_server_nested2_1b_port + disk.read.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.read.requests_server_nested2_1c1_cmaui_1 + disk.device.write.requests_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.device.write.requests_ps_server_main_1b + disk.allocation_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - disk.allocation_ps_server_main_1b + disk.latency_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - disk.latency_pd_server_main_1b + disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + disk.device.capacity_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.device.capacity_server_nested2_1c1_cmaui_1 + disk.device.write.bytes_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - disk.device.write.bytes_server_nested2_1c1_cmaui_2 + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - disk.device.write.bytes.rate_server_pd_pattern4 + disk.device.latency_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - disk.device.latency_server_nested2_pd_1b + endpoint_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - endpoint_server_pd_pattern4_test_nested_pattern_4_nested2 + disk.write.requests_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - disk.write.requests_server_nested2_1c1_cmaui_1 + disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2 + network.outgoing.packets.rate_cmaui_port_12: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port + binding_cmaui_port_12: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_port + network.outgoing.packets.rate_cmaui_port_11: + - abstract_cmaui_1c1_main + - network.outgoing.packets.rate_cmaui_1c1_main_cmaui_port + binding_cmaui_port_11: + - abstract_cmaui_1c1_main + - binding_cmaui_1c1_main_cmaui_port + network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + os_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - os_server_nested2_1c1_cmaui_1 + binding_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - binding_server_nested2_ps_1b + disk.write.requests.rate_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - disk.write.requests.rate_server_nested2_ps_1b + attachment_cmaui_port_12: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_port + attachment_cmaui_port_11: + - abstract_cmaui_1c1_main + - attachment_cmaui_1c1_main_cmaui_port + feature_test_resourceGroup_test_nested2Level: + - test_nested2Level + - feature_test_resourceGroup + disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2 + feature_cmaui_port_1_test_nested2Level: + - test_nested2Level + - feature_cmaui_port_1 + disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + cpu.delta_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - cpu.delta_server_nested2_1c1_cmaui_1 + network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + network.incoming.packets_cmaui_port_1_test_nested2Level: + - test_nested2Level + - network.incoming.packets_cmaui_port_1 + disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2 + requirements: + dependency_jsa_security_group2_test_resourceGroup_test_nested2Level: + - test_nested2Level + - dependency_jsa_security_group2_test_resourceGroup + link_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_port_01 + dependency_cmaui_port_2_test_nested2Level: + - test_nested2Level + - dependency_cmaui_port_2 + dependency_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - dependency_server_nested2_1c1_cmaui_1 + port_jsa_security_group1_test_nested3Level_test_nested2Level: + - test_nested2Level + - port_jsa_security_group1_test_nested3Level + link_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - link_pd_server_pattern4_port_02 + dependency_test_nested2Level: + - test_nested2Level + - dependency + dependency_pd_server_pattern4_port_02_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency_pd_server_pattern4_port_02 + local_storage_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - local_storage_ps_server_main_1b + dependency_cmaui_port_11: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_port + dependency_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - dependency_pd_server_main_1b + dependency_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main + dependency_cmaui_port_12: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main_cmaui_port + dependency_pd_server_pattern4_port_01_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency_pd_server_pattern4_port_01 + local_storage_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - local_storage_server_pd_pattern4_test_nested_pattern_4_nested2 + local_storage_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - local_storage_server_nested2_1c1_cmaui_2 + local_storage_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - local_storage_server_nested2_pd_1b + local_storage_server_nested2_1c1_cmaui_1_test_nested2Level: + - test_nested2Level + - local_storage_server_nested2_1c1_cmaui_1 + local_storage_server_main_pd_1b_1: + - abstract_pd_server_main_1b + - local_storage_pd_server_main_1b + dependency_test_resourceGroup_test_nested2Level: + - test_nested2Level + - dependency_test_resourceGroup + link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + dependency_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - dependency_pd_server_nested2_1b_port + dependency_server_nested2_1c1_cmaui_2_test_nested2Level: + - test_nested2Level + - dependency_server_nested2_1c1_cmaui_2 + link_pd_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - link_pd_server_nested2_1b_port + dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + dependency_server_pd_pattern4_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - dependency_server_pd_pattern4_test_nested_pattern_4_nested2 + dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + dependency_cmaui_port_1_test_nested2Level: + - test_nested2Level + - dependency_cmaui_port_1 + local_storage_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - local_storage_server_pd_pattern4 + dependency_server_main_ps_1b_1: + - abstract_ps_server_main_1b + - dependency_ps_server_main_1b + dependency_server_nested2_pd_1b_test_nested2Level: + - test_nested2Level + - dependency_server_nested2_pd_1b + dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file + dependency_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - dependency_server_nested2_ps_1b + dependency_jsa_security_group1_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_jsa_security_group1_test_nested3Level + link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file + local_storage_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - local_storage_cmaui_1c1_main + dependency_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - dependency_pd_server_main_1b_pd_server_main_1b_port + link_cmaui_port_11: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_port + dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2 + link_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - link_ps_server_main_1b_ps_server_main_1b_port + dependency_jsa_security_group1_test_resourceGroup_test_nested2Level: + - test_nested2Level + - dependency_jsa_security_group1_test_resourceGroup + dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2 + link_cmaui_port_2_test_nested2Level: + - test_nested2Level + - link_cmaui_port_2 + link_cmaui_port_12: + - abstract_cmaui_1c1_main + - link_cmaui_1c1_main_cmaui_port + dependency_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - dependency_test_nested_pattern_4_same_type_diff_file + link_pd_server_main_1b_port_1: + - abstract_pd_server_main_1b + - link_pd_server_main_1b_pd_server_main_1b_port + link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file_test_nested2Level: + - test_nested2Level + - link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file + port_jsa_security_group2_test_resourceGroup_test_nested2Level: + - test_nested2Level + - port_jsa_security_group2_test_resourceGroup + port_jsa_security_group2_test_nested3Level_test_nested2Level: + - test_nested2Level + - port_jsa_security_group2_test_nested3Level + dependency_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency + dependency_jsa_security_group2_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_jsa_security_group2_test_nested3Level + dependency_server_pd_pattern4_test_nested_pattern_4_main_1: + - test_nested_pattern_4_main_1 + - dependency_server_pd_pattern4 + link_cmaui_port_1_test_nested2Level: + - test_nested2Level + - link_cmaui_port_1 + local_storage_server_main_1c1_cmaui_21: + - abstract_cmaui_1c1_main + - local_storage_cmaui_1c1_main + local_storage_server_nested2_ps_1b_test_nested2Level: + - test_nested2Level + - local_storage_server_nested2_ps_1b + dependency_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - dependency_ps_server_nested2_1b_port + link_ps_server_nested2_1b_port_test_nested2Level: + - test_nested2Level + - link_ps_server_nested2_1b_port + dependency_server_main_1c1_cmaui_11: + - abstract_cmaui_1c1_main + - dependency_cmaui_1c1_main + dependency_ps_server_main_1b_port_1: + - abstract_ps_server_main_1b + - dependency_ps_server_main_1b_ps_server_main_1b_port + port_jsa_security_group1_test_resourceGroup_test_nested2Level: + - test_nested2Level + - port_jsa_security_group1_test_resourceGroup + dependency_test_nested_pattern_4_nested2_test_nested2Level: + - test_nested2Level + - dependency_test_nested_pattern_4_nested2 + dependency_test_nested3Level_test_nested2Level: + - test_nested2Level + - dependency_test_nested3Level diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml index 64c8db033f..2c2094efe0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested2ServiceTemplate.yaml @@ -1,1552 +1,1559 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested2
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- cmaui_1c1_nested2_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- cmaui_1c1_nested2_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- ps_server_nested2_1b_ips:
- hidden: false
- immutable: false
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: string
- description: security_group_name
- pd_server_nested2_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- contrail_net_name:
- hidden: false
- immutable: false
- type: string
- description: network name of contrail v2 network
- jsa_net_name:
- hidden: false
- immutable: false
- type: string
- description: network name of jsa network
- ps_server_nested2_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- pd_server_nested2_1b_ips:
- hidden: false
- immutable: false
- type: string
- jsa_name:
- hidden: false
- immutable: false
- type: string
- description: network name of jsa log network
- cmaui_1c1_nested2_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- ps_server_nested2_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PS server
- pd_server_nested2_1b_names:
- hidden: false
- immutable: false
- type: list
- description: PD server names
- entry_schema:
- type: string
- name:
- hidden: false
- immutable: false
- type: string
- description: nested parameter
- pd_server_nested2_1b_image:
- hidden: false
- immutable: false
- type: string
- description: PD Image server
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- ps_server_nested2_1b_image:
- hidden: false
- immutable: false
- type: string
- description: Ps Image server
- node_templates:
- abstract_pd_server_nested2_1b:
- type: org.openecomp.resource.abstract.nodes.pd_server_nested2_1b
- directives:
- - substitutable
- properties:
- port_pd_server_nested2_1b_port_replacement_policy:
- - AUTO
- port_pd_server_nested2_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_nested2_1b_ips
- - 0
- port_pd_server_nested2_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_flavor_name:
- get_input: pd_server_nested2_1b_flavor
- compute_pd_server_nested2_1b_availability_zone:
- - get_input: availability_zone_0
- compute_pd_server_nested2_1b_name:
- - get_input:
- - pd_server_nested2_1b_names
- - 0
- vm_image_name:
- get_input: pd_server_nested2_1b_image
- port_pd_server_nested2_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_nested2_1b_port_network:
- - get_input: jsa_name
- service_template_filter:
- substitute_service_template: Nested_pd_server_nested2_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_nested_pattern_4_nested2:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4
- directives:
- - substitutable
- properties:
- p1:
- get_input: jsa_name
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- port_pd_server_pattern4_port_01_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_pattern4_port_02_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_01_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- test_nested3Level:
- type: org.openecomp.resource.abstract.nodes.heat.nested3
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested3ServiceTemplate.yaml
- name:
- get_input: security_group_name
- test_nested_pattern_4_same_type_diff_file:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4_2
- directives:
- - substitutable
- properties:
- p1:
- get_input: jsa_name
- service_template_filter:
- substitute_service_template: nested-pattern-4-same-typeServiceTemplate.yaml
- port_pd_server_pattern4_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_pattern4_port_2_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_1_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_pattern4_port_2_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- abstract_ps_server_nested2_1b:
- type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b
- directives:
- - substitutable
- properties:
- port_ps_server_nested2_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_ps_server_nested2_1b_name:
- - get_input:
- - ps_server_nested2_1b_names
- - 1
- compute_ps_server_nested2_1b_availability_zone:
- - get_input: availability_zone_0
- port_ps_server_nested2_1b_port_replacement_policy:
- - AUTO
- vm_flavor_name:
- get_input: ps_server_nested2_1b_flavor
- port_ps_server_nested2_1b_port_network:
- - get_input: jsa_name
- vm_image_name:
- get_input: ps_server_nested2_1b_image
- port_ps_server_nested2_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_nested2_1b_ips
- - 0
- port_ps_server_nested2_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_ps_server_nested2_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_resourceGroup:
- type: org.openecomp.resource.abstract.nodes.heat.nested3
- directives:
- - substitutable
- properties:
- p1:
- get_input: name
- service_template_filter:
- substitute_service_template: nested3ServiceTemplate.yaml
- count: 9
- mandatory: true
- indx:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_cmaui_1c1_nested2:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - get_input: contrail_net_name
- - get_input: contrail_net_name
- port_cmaui_port_network_role_tag: contrail
- vm_flavor_name:
- get_input: cmaui_1c1_nested2_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_nested2_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_nested2_name:
- - get_input:
- - cmaui_1c1_nested2_names
- - 1
- - get_input:
- - cmaui_1c1_nested2_names
- - 0
- compute_cmaui_1c1_nested2_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1_nested2ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- nested2_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested2.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - test_resourceGroup
- - test_nested_pattern_4_nested2
- - test_nested3Level
- - test_nested_pattern_4_same_type_diff_file
- - abstract_cmaui_1c1_nested2
- - abstract_pd_server_nested2_1b
- - abstract_ps_server_nested2_1b
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested2
- capabilities:
- instance_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - instance_cmaui_1c1_nested2
- disk.allocation_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.allocation_ps_server_nested2_1b
- scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - scalable_server_pd_pattern4_1
- network.incoming.packets.rate_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port
- os_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - os_pd_server_nested2_1b
- disk.device.usage_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.usage_pd_server_nested2_1b
- disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.write.bytes_server_pd_pattern4
- vcpus_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - vcpus_pd_server_nested2_1b
- memory.usage_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - memory.usage_cmaui_1c1_nested2
- disk.device.latency_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.latency_cmaui_1c1_nested2
- memory.usage_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - memory.usage_cmaui_1c1_nested2
- instance_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - instance_cmaui_1c1_nested2
- disk.device.latency_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.latency_cmaui_1c1_nested2
- forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - forwarder_pd_server_pattern4_port_2
- disk.iops_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.iops_ps_server_nested2_1b
- disk.read.bytes_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.read.bytes_pd_server_nested2_1b
- network.outgoing.packets.rate_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
- memory.resident_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - memory.resident_ps_server_nested2_1b
- network.outpoing.packets_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.outpoing.packets_pd_server_nested2_1b_pd_server_nested2_1b_port
- disk.device.read.bytes_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.bytes_cmaui_1c1_nested2
- disk.device.read.bytes_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.bytes_cmaui_1c1_nested2
- endpoint_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - endpoint_pd_server_nested2_1b
- cpu_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - cpu_server_pd_pattern4
- network.outgoing.bytes_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port
- disk.device.allocation_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.allocation_pd_server_nested2_1b
- network.outgoing.bytes_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port
- disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.read.requests_server_pd_pattern4
- network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.bytes.rate_pd_server_pattern4_port_1
- disk.write.bytes.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.write.bytes.rate_ps_server_nested2_1b
- network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.packets.rate_pd_server_pattern4_port_2
- disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.write.requests_server_pd_pattern4_1
- forwarder_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port
- memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - memory.resident_server_pd_pattern4_1
- feature_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - feature
- network.outgoing.bytes.rate_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
- memory_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - memory_server_pd_pattern4
- disk.write.bytes.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.write.bytes.rate_cmaui_1c1_nested2
- disk.write.bytes.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.write.bytes.rate_cmaui_1c1_nested2
- attachment_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - attachment_ps_server_nested2_1b_ps_server_nested2_1b_port
- binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - binding_pd_server_pattern4_port_1
- forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - forwarder_pd_server_pattern4_port_01
- attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - attachment_pd_server_pattern4_port_02
- disk.device.iops_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.iops_ps_server_nested2_1b
- disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.ephemeral.size_server_pd_pattern4_1
- disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.read.bytes.rate_server_pd_pattern4_1
- os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - os_server_pd_pattern4_1
- cpu_util_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - cpu_util_pd_server_nested2_1b
- network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.packets_pd_server_pattern4_port_01
- network.incoming.packets_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port
- disk.write.bytes.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.write.bytes.rate_pd_server_nested2_1b
- network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.packets.rate_pd_server_pattern4_port_02
- disk.device.capacity_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.capacity_cmaui_1c1_nested2
- disk.device.capacity_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.capacity_cmaui_1c1_nested2
- binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - binding_pd_server_pattern4_port_02
- network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outpoing.packets_pd_server_pattern4_port_1
- disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.write.requests.rate_server_pd_pattern4_1
- disk.write.bytes_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.write.bytes_ps_server_nested2_1b
- disk.latency_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.latency_pd_server_nested2_1b
- network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.packets_pd_server_pattern4_port_1
- network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.packets_pd_server_pattern4_port_2
- binding_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - binding_cmaui_1c1_nested2_cmaui_port
- binding_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - binding_cmaui_1c1_nested2_cmaui_port
- network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.packets.rate_pd_server_pattern4_port_1
- disk.device.capacity_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.capacity_ps_server_nested2_1b
- network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.bytes.rate_pd_server_pattern4_port_1
- network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outpoing.packets_pd_server_pattern4_port_2
- disk.read.requests_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.read.requests_ps_server_nested2_1b
- network.incoming.bytes_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port
- network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.bytes.rate_pd_server_pattern4_port_02
- feature_test_resourceGroup:
- - test_resourceGroup
- - feature
- disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.read.bytes_server_pd_pattern4_1
- network.incoming.bytes_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port
- disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.write.requests.rate_server_pd_pattern4
- disk.device.read.bytes.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.read.bytes.rate_pd_server_nested2_1b
- network.incoming.bytes_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port
- disk.write.requests.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.write.requests.rate_pd_server_nested2_1b
- scalable_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - scalable_server_pd_pattern4
- disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.iops_server_pd_pattern4_1
- disk.allocation_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.allocation_cmaui_1c1_nested2
- disk.usage_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.usage_ps_server_nested2_1b
- disk.allocation_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.allocation_cmaui_1c1_nested2
- network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.packets.rate_pd_server_pattern4_port_01
- disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.bytes.rate_cmaui_1c1_nested2
- network.incoming.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port
- network.incoming.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port
- disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.bytes.rate_cmaui_1c1_nested2
- feature_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - feature_cmaui_1c1_nested2_cmaui_port
- feature_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - feature_cmaui_1c1_nested2_cmaui_port
- os_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - os_ps_server_nested2_1b
- disk.device.read.requests_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.read.requests_ps_server_nested2_1b
- network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.packets.rate_pd_server_pattern4_port_01
- disk.ephemeral.size_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.ephemeral.size_ps_server_nested2_1b
- disk.device.iops_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.iops_pd_server_nested2_1b
- network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.packets.rate_pd_server_pattern4_port_1
- feature_jsa_security_group1_test_resourceGroup:
- - test_resourceGroup
- - feature_jsa_security_group1
- disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.write.requests.rate_server_pd_pattern4_1
- disk.device.usage_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.usage_ps_server_nested2_1b
- feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - feature_pd_server_pattern4_port_2
- disk.device.write.requests.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.requests.rate_cmaui_1c1_nested2
- disk.device.write.requests.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.requests.rate_cmaui_1c1_nested2
- memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - memory.usage_server_pd_pattern4_1
- disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.latency_server_pd_pattern4
- cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - cpu_util_server_pd_pattern4
- binding_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - binding_cmaui_1c1_nested2
- binding_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - binding_cmaui_1c1_nested2
- feature_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - feature_cmaui_1c1_nested2
- disk.write.requests.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.write.requests.rate_cmaui_1c1_nested2
- feature_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - feature_cmaui_1c1_nested2
- disk.write.requests.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.write.requests.rate_cmaui_1c1_nested2
- disk.root.size_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.root.size_pd_server_nested2_1b
- disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.write.requests_server_pd_pattern4
- memory.usage_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - memory.usage_ps_server_nested2_1b
- disk.read.bytes.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.read.bytes.rate_cmaui_1c1_nested2
- cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - cpu_util_server_pd_pattern4_1
- disk.read.bytes.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.read.bytes.rate_cmaui_1c1_nested2
- endpoint_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - endpoint_ps_server_nested2_1b
- network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.bytes_pd_server_pattern4_port_02
- forwarder_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - forwarder_cmaui_1c1_nested2_cmaui_port
- network.incoming.bytes_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port
- forwarder_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - forwarder_cmaui_1c1_nested2_cmaui_port
- vcpus_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - vcpus_cmaui_1c1_nested2
- vcpus_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - vcpus_ps_server_nested2_1b
- vcpus_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - vcpus_cmaui_1c1_nested2
- disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.write.bytes.rate_server_pd_pattern4_1
- disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.iops_server_pd_pattern4
- disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.allocation_server_pd_pattern4_1
- disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.usage_server_pd_pattern4
- network.outgoing.bytes_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port
- disk.write.requests_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.write.requests_pd_server_nested2_1b
- disk.device.write.bytes_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.write.bytes_ps_server_nested2_1b
- network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.bytes_pd_server_pattern4_port_02
- disk.latency_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.latency_ps_server_nested2_1b
- memory.resident_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - memory.resident_cmaui_1c1_nested2
- network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.bytes.rate_pd_server_pattern4_port_02
- disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.allocation_server_pd_pattern4
- disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.read.bytes.rate_server_pd_pattern4_1
- feature_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - feature_pd_server_nested2_1b_pd_server_nested2_1b_port
- cpu_util_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - cpu_util_ps_server_nested2_1b
- disk.device.write.requests.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.write.requests.rate_pd_server_nested2_1b
- disk.read.requests_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.read.requests_pd_server_nested2_1b
- disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.read.requests.rate_server_pd_pattern4_1
- disk.device.capacity_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.capacity_pd_server_nested2_1b
- disk.capacity_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.capacity_ps_server_nested2_1b
- instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - instance_server_pd_pattern4_1
- disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.read.requests_server_pd_pattern4_1
- os_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - os_cmaui_1c1_nested2
- disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.latency_server_pd_pattern4_1
- disk.read.bytes_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.read.bytes_ps_server_nested2_1b
- os_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - os_cmaui_1c1_nested2
- network.incoming.bytes.rate_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port
- attachment_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port
- attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - attachment_pd_server_pattern4_port_01
- feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - feature_pd_server_pattern4_port_02
- feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - feature_server_pd_pattern4_1
- disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.allocation_server_pd_pattern4
- network.outpoing.packets_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port
- network.outpoing.packets_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port
- disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.iops_server_pd_pattern4_1
- disk.ephemeral.size_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.ephemeral.size_pd_server_nested2_1b
- memory.resident_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - memory.resident_pd_server_nested2_1b
- network.outgoing.packets.rate_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port
- disk.device.usage_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.usage_cmaui_1c1_nested2
- disk.device.usage_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.usage_cmaui_1c1_nested2
- feature_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - feature_server_pd_pattern4
- disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.write.requests.rate_server_pd_pattern4
- network.outpoing.packets_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.outpoing.packets_ps_server_nested2_1b_ps_server_nested2_1b_port
- feature_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - feature_ps_server_nested2_1b
- memory.resident_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - memory.resident_cmaui_1c1_nested2
- disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.write.bytes_server_pd_pattern4_1
- disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.latency_server_pd_pattern4
- host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - host_server_pd_pattern4_1
- disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.latency_server_pd_pattern4_1
- disk.device.iops_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.iops_cmaui_1c1_nested2
- disk.device.iops_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.iops_cmaui_1c1_nested2
- disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.usage_server_pd_pattern4
- disk.device.write.bytes.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.write.bytes.rate_pd_server_nested2_1b
- forwarder_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port
- attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - attachment_pd_server_pattern4_port_2
- network.outgoing.bytes.rate_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port
- network.incoming.packets.rate_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
- binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - binding_pd_server_pattern4_port_01
- disk.device.read.requests_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.requests_cmaui_1c1_nested2
- binding_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - binding_ps_server_nested2_1b_ps_server_nested2_1b_port
- host_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - host_server_pd_pattern4
- disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.read.requests_server_pd_pattern4
- cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - cpu.delta_server_pd_pattern4_1
- disk.usage_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.usage_pd_server_nested2_1b
- disk.device.read.bytes.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.read.bytes.rate_ps_server_nested2_1b
- network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.bytes.rate_pd_server_pattern4_port_2
- network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.bytes_pd_server_pattern4_port_01
- disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.write.bytes_server_pd_pattern4
- disk.device.read.requests_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.requests_cmaui_1c1_nested2
- feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - feature_pd_server_pattern4_port_1
- network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.bytes.rate_pd_server_pattern4_port_01
- scalable_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - scalable_cmaui_1c1_nested2
- cpu.delta_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - cpu.delta_cmaui_1c1_nested2
- cpu.delta_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - cpu.delta_cmaui_1c1_nested2
- cpu_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - cpu_pd_server_nested2_1b
- network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outpoing.packets_pd_server_pattern4_port_01
- disk.device.latency_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.latency_ps_server_nested2_1b
- disk.capacity_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.capacity_pd_server_nested2_1b
- memory.usage_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - memory.usage_pd_server_nested2_1b
- disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.write.bytes_server_pd_pattern4_1
- cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - cpu_server_pd_pattern4_1
- binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - binding_server_pd_pattern4_1
- cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - cpu.delta_server_pd_pattern4
- scalable_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - scalable_cmaui_1c1_nested2
- host_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - host_cmaui_1c1_nested2
- host_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - host_cmaui_1c1_nested2
- disk.capacity_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.capacity_cmaui_1c1_nested2
- feature_jsa_security_group1_test_nested3Level:
- - test_nested3Level
- - feature_jsa_security_group1
- network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.bytes_pd_server_pattern4_port_2
- disk.capacity_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.capacity_cmaui_1c1_nested2
- disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.allocation_server_pd_pattern4_1
- disk.device.read.bytes_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.read.bytes_ps_server_nested2_1b
- disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.usage_server_pd_pattern4_1
- disk.device.read.requests_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.read.requests_pd_server_nested2_1b
- disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.write.requests_server_pd_pattern4
- feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - feature_pd_server_pattern4_port_01
- endpoint_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - endpoint_cmaui_1c1_nested2
- network.incoming.packets_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.incoming.packets_cmaui_1c1_nested2_cmaui_port
- disk.device.write.requests.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.write.requests.rate_ps_server_nested2_1b
- network.incoming.packets_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.incoming.packets_ps_server_nested2_1b_ps_server_nested2_1b_port
- binding_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - binding_pd_server_nested2_1b
- network.incoming.packets_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.incoming.packets_cmaui_1c1_nested2_cmaui_port
- feature_jsa_security_group2_test_nested3Level:
- - test_nested3Level
- - feature_jsa_security_group2
- feature_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - feature
- disk.root.size_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.root.size_ps_server_nested2_1b
- endpoint_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - endpoint_cmaui_1c1_nested2
- disk.device.write.bytes_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.write.bytes_pd_server_nested2_1b
- disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.ephemeral.size_server_pd_pattern4
- disk.usage_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.usage_cmaui_1c1_nested2
- disk.usage_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.usage_cmaui_1c1_nested2
- disk.device.write.requests_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.write.requests_pd_server_nested2_1b
- network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.bytes_pd_server_pattern4_port_2
- disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.root.size_server_pd_pattern4_1
- cpu.delta_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - cpu.delta_pd_server_nested2_1b
- disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.write.requests_server_pd_pattern4_1
- network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.bytes_pd_server_pattern4_port_1
- host_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - host_ps_server_nested2_1b
- disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.write.bytes.rate_server_pd_pattern4
- feature_jsa_security_group2_test_resourceGroup:
- - test_resourceGroup
- - feature_jsa_security_group2
- feature_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - feature_pd_server_nested2_1b
- disk.device.read.requests.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.read.requests.rate_ps_server_nested2_1b
- disk.read.requests_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.read.requests_cmaui_1c1_nested2
- disk.device.read.requests.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.requests.rate_cmaui_1c1_nested2
- network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.packets_pd_server_pattern4_port_02
- disk.read.requests_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.read.requests_cmaui_1c1_nested2
- disk.device.read.requests.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.requests.rate_cmaui_1c1_nested2
- cpu_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - cpu_cmaui_1c1_nested2
- network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.packets.rate_pd_server_pattern4_port_2
- cpu_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - cpu_cmaui_1c1_nested2
- instance_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - instance_pd_server_nested2_1b
- memory_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - memory_cmaui_1c1_nested2
- memory_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - memory_cmaui_1c1_nested2
- disk.device.write.requests_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.requests_cmaui_1c1_nested2
- memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - memory_server_pd_pattern4_1
- disk.device.write.requests_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.requests_cmaui_1c1_nested2
- network.outgoing.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port
- disk.write.requests_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.write.requests_ps_server_nested2_1b
- disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.read.requests.rate_server_pd_pattern4
- network.outgoing.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port
- disk.device.write.bytes_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.bytes_cmaui_1c1_nested2
- memory_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - memory_ps_server_nested2_1b
- binding_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - binding_server_pd_pattern4
- disk.read.bytes_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.read.bytes_cmaui_1c1_nested2
- endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - endpoint_server_pd_pattern4_1
- disk.read.bytes_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.read.bytes_cmaui_1c1_nested2
- disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.read.bytes.rate_server_pd_pattern4
- disk.device.write.bytes_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.write.bytes_cmaui_1c1_nested2
- vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - vcpus_server_pd_pattern4_1
- os_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - os_server_pd_pattern4
- forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - forwarder_pd_server_pattern4_port_1
- disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.read.requests_server_pd_pattern4_1
- attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - attachment_pd_server_pattern4_port_1
- disk.write.requests_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.write.requests_cmaui_1c1_nested2
- disk.write.requests_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.write.requests_cmaui_1c1_nested2
- memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - memory.resident_server_pd_pattern4
- scalable_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - scalable_ps_server_nested2_1b
- instance_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - instance_server_pd_pattern4
- disk.ephemeral.size_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.ephemeral.size_cmaui_1c1_nested2
- disk.ephemeral.size_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.ephemeral.size_cmaui_1c1_nested2
- network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outpoing.packets_pd_server_pattern4_port_02
- disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.capacity_server_pd_pattern4
- memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - memory.usage_server_pd_pattern4
- disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.read.bytes.rate_server_pd_pattern4
- forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - forwarder_pd_server_pattern4_port_02
- disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.capacity_server_pd_pattern4
- attachment_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - attachment_cmaui_1c1_nested2_cmaui_port
- disk.allocation_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.allocation_pd_server_nested2_1b
- cpu_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - cpu_ps_server_nested2_1b
- disk.device.write.bytes.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.write.bytes.rate_ps_server_nested2_1b
- disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.write.bytes.rate_server_pd_pattern4
- disk.read.bytes.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.read.bytes.rate_ps_server_nested2_1b
- disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.read.bytes_server_pd_pattern4
- network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.incoming.bytes.rate_pd_server_pattern4_port_2
- network.outgoing.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port
- network.outgoing.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port
- attachment_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - attachment_cmaui_1c1_nested2_cmaui_port
- disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.device.iops_server_pd_pattern4
- disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.read.bytes_server_pd_pattern4_1
- disk.root.size_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.root.size_cmaui_1c1_nested2
- disk.root.size_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.root.size_cmaui_1c1_nested2
- disk.device.latency_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.latency_pd_server_nested2_1b
- disk.write.bytes_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.write.bytes_cmaui_1c1_nested2
- network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - network.outgoing.bytes_pd_server_pattern4_port_1
- disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.usage_server_pd_pattern4_1
- disk.write.bytes_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.write.bytes_cmaui_1c1_nested2
- disk.iops_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.iops_cmaui_1c1_nested2
- feature_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - feature_ps_server_nested2_1b_ps_server_nested2_1b_port
- disk.iops_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.iops_cmaui_1c1_nested2
- network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.bytes_pd_server_pattern4_port_01
- disk.iops_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.iops_pd_server_nested2_1b
- disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.bytes.rate_cmaui_1c1_nested2
- binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - binding_pd_server_pattern4_port_2
- disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.read.bytes.rate_cmaui_1c1_nested2
- disk.latency_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.latency_cmaui_1c1_nested2
- vcpus_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - vcpus_server_pd_pattern4
- feature_test_nested3Level:
- - test_nested3Level
- - feature
- disk.device.write.requests_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.write.requests_ps_server_nested2_1b
- endpoint_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - endpoint_server_pd_pattern4
- disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.capacity_server_pd_pattern4_1
- memory_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - memory_pd_server_nested2_1b
- disk.write.requests.rate_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.write.requests.rate_ps_server_nested2_1b
- cpu_util_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - cpu_util_cmaui_1c1_nested2
- disk.device.read.bytes_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.read.bytes_pd_server_nested2_1b
- disk.latency_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.latency_cmaui_1c1_nested2
- cpu_util_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - cpu_util_cmaui_1c1_nested2
- instance_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - instance_ps_server_nested2_1b
- network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.incoming.bytes.rate_pd_server_pattern4_port_01
- network.incoming.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port
- network.incoming.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port
- host_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - host_pd_server_nested2_1b
- disk.write.bytes_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.write.bytes_pd_server_nested2_1b
- disk.read.bytes.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.read.bytes.rate_pd_server_nested2_1b
- binding_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - binding_pd_server_nested2_1b_pd_server_nested2_1b_port
- disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.root.size_server_pd_pattern4
- network.incoming.bytes.rate_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port
- disk.device.read.requests.rate_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - disk.device.read.requests.rate_pd_server_nested2_1b
- binding_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - binding_ps_server_nested2_1b
- disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.device.write.bytes.rate_server_pd_pattern4_1
- disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - disk.read.bytes_server_pd_pattern4
- disk.device.allocation_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - disk.device.allocation_ps_server_nested2_1b
- scalable_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - scalable_pd_server_nested2_1b
- disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - disk.capacity_server_pd_pattern4_1
- network.outgoing.bytes_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port
- network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - network.outgoing.packets.rate_pd_server_pattern4_port_02
- disk.device.allocation_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - disk.device.allocation_cmaui_1c1_nested2
- cpu.delta_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - cpu.delta_ps_server_nested2_1b
- disk.device.allocation_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - disk.device.allocation_cmaui_1c1_nested2
- requirements:
- dependency_jsa_security_group1_test_resourceGroup:
- - test_resourceGroup
- - dependency_jsa_security_group1
- port_jsa_security_group2_test_resourceGroup:
- - test_resourceGroup
- - port_jsa_security_group2
- dependency_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - dependency_cmaui_1c1_nested2
- dependency_jsa_security_group2_test_nested3Level:
- - test_nested3Level
- - dependency_jsa_security_group2
- port_jsa_security_group1_test_resourceGroup:
- - test_resourceGroup
- - port_jsa_security_group1
- link_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - link_ps_server_nested2_1b_ps_server_nested2_1b_port
- dependency_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - dependency_ps_server_nested2_1b
- dependency_jsa_security_group2_test_resourceGroup:
- - test_resourceGroup
- - dependency_jsa_security_group2
- local_storage_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - local_storage_server_pd_pattern4
- dependency_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - dependency_cmaui_1c1_nested2
- dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - dependency_pd_server_pattern4_port_01
- port_jsa_security_group2_test_nested3Level:
- - test_nested3Level
- - port_jsa_security_group2
- dependency_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - dependency_pd_server_nested2_1b
- link_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - link_cmaui_1c1_nested2_cmaui_port
- link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - link_pd_server_pattern4_port_02
- link_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - link_cmaui_1c1_nested2_cmaui_port
- local_storage_server_nested2_ps_1b:
- - abstract_ps_server_nested2_1b
- - local_storage_ps_server_nested2_1b
- dependency_test_resourceGroup:
- - test_resourceGroup
- - dependency
- local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - local_storage_server_pd_pattern4_1
- dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - dependency_pd_server_pattern4_port_02
- dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - dependency_pd_server_pattern4_port_1
- dependency_cmaui_port_1:
- - abstract_cmaui_1c1_nested2
- - dependency_cmaui_1c1_nested2_cmaui_port
- link_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - link_pd_server_nested2_1b_pd_server_nested2_1b_port
- dependency_server_pd_pattern4_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - dependency_server_pd_pattern4
- dependency_test_nested3Level:
- - test_nested3Level
- - dependency
- dependency_cmaui_port_2:
- - abstract_cmaui_1c1_nested2
- - dependency_cmaui_1c1_nested2_cmaui_port
- dependency_pd_server_nested2_1b_port:
- - abstract_pd_server_nested2_1b
- - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port
- port_jsa_security_group1_test_nested3Level:
- - test_nested3Level
- - port_jsa_security_group1
- dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - dependency_server_pd_pattern4_1
- link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - link_pd_server_pattern4_port_01
- dependency_ps_server_nested2_1b_port:
- - abstract_ps_server_nested2_1b
- - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port
- dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - dependency_pd_server_pattern4_port_2
- link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - link_pd_server_pattern4_port_2
- dependency_jsa_security_group1_test_nested3Level:
- - test_nested3Level
- - dependency_jsa_security_group1
- link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - link_pd_server_pattern4_port_1
- local_storage_server_nested2_1c1_cmaui_2:
- - abstract_cmaui_1c1_nested2
- - local_storage_cmaui_1c1_nested2
- local_storage_server_nested2_pd_1b:
- - abstract_pd_server_nested2_1b
- - local_storage_pd_server_nested2_1b
- dependency_test_nested_pattern_4_same_type_diff_file:
- - test_nested_pattern_4_same_type_diff_file
- - dependency
- local_storage_server_nested2_1c1_cmaui_1:
- - abstract_cmaui_1c1_nested2
- - local_storage_cmaui_1c1_nested2
- dependency_test_nested_pattern_4_nested2:
- - test_nested_pattern_4_nested2
- - dependency
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested2 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + cmaui_1c1_nested2_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + cmaui_1c1_nested2_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + ps_server_nested2_1b_ips: + hidden: false + immutable: false + type: string + security_group_name: + hidden: false + immutable: false + type: string + description: security_group_name + pd_server_nested2_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + contrail_net_name: + hidden: false + immutable: false + type: string + description: network name of contrail v2 network + jsa_net_name: + hidden: false + immutable: false + type: string + description: network name of jsa network + ps_server_nested2_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + pd_server_nested2_1b_ips: + hidden: false + immutable: false + type: string + jsa_name: + hidden: false + immutable: false + type: string + description: network name of jsa log network + cmaui_1c1_nested2_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + ps_server_nested2_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PS server + pd_server_nested2_1b_names: + hidden: false + immutable: false + type: list + description: PD server names + entry_schema: + type: string + name: + hidden: false + immutable: false + type: string + description: nested parameter + pd_server_nested2_1b_image: + hidden: false + immutable: false + type: string + description: PD Image server + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + cmaui_oam_ips: + hidden: false + immutable: false + type: string + ps_server_nested2_1b_image: + hidden: false + immutable: false + type: string + description: Ps Image server + node_templates: + abstract_pd_server_nested2_1b: + type: org.openecomp.resource.abstract.nodes.pd_server_nested2_1b + directives: + - substitutable + properties: + port_pd_server_nested2_1b_port_replacement_policy: + - AUTO + port_pd_server_nested2_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_nested2_1b_ips + - 0 + port_pd_server_nested2_1b_port_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_nested2_1b_flavor + compute_pd_server_nested2_1b_availability_zone: + - get_input: availability_zone_0 + compute_pd_server_nested2_1b_name: + - get_input: + - pd_server_nested2_1b_names + - 0 + vm_image_name: + get_input: pd_server_nested2_1b_image + port_pd_server_nested2_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_nested2_1b_port_network: + - get_input: jsa_name + port_pd_server_nested2_1b_port_subinterface_indicator: + - true + service_template_filter: + substitute_service_template: Nested_pd_server_nested2_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_nested_pattern_4_nested2: + type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4 + directives: + - substitutable + properties: + p1: + get_input: jsa_name + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + port_pd_server_pattern4_port_01_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_02_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_pattern4_port_02_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_01_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + test_nested3Level: + type: org.openecomp.resource.abstract.nodes.heat.nested3 + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested3ServiceTemplate.yaml + name: + get_input: security_group_name + test_nested_pattern_4_same_type_diff_file: + type: org.openecomp.resource.abstract.nodes.heat.pd_server_pattern4_2 + directives: + - substitutable + properties: + p1: + get_input: jsa_name + service_template_filter: + substitute_service_template: nested-pattern-4-same-typeServiceTemplate.yaml + port_pd_server_pattern4_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_pattern4_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_1_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_pattern4_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + abstract_ps_server_nested2_1b: + type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b + directives: + - substitutable + properties: + port_ps_server_nested2_1b_port_subinterface_indicator: + - true + port_ps_server_nested2_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_ps_server_nested2_1b_name: + - get_input: + - ps_server_nested2_1b_names + - 1 + compute_ps_server_nested2_1b_availability_zone: + - get_input: availability_zone_0 + port_ps_server_nested2_1b_port_replacement_policy: + - AUTO + vm_flavor_name: + get_input: ps_server_nested2_1b_flavor + port_ps_server_nested2_1b_port_network: + - get_input: jsa_name + vm_image_name: + get_input: ps_server_nested2_1b_image + port_ps_server_nested2_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_nested2_1b_ips + - 0 + port_ps_server_nested2_1b_port_mac_requirements: + mac_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_ps_server_nested2_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_resourceGroup: + type: org.openecomp.resource.abstract.nodes.heat.nested3 + directives: + - substitutable + properties: + p1: + get_input: name + service_template_filter: + substitute_service_template: nested3ServiceTemplate.yaml + count: 9 + mandatory: true + indx: + get_property: + - SELF + - service_template_filter + - index_value + abstract_cmaui_1c1_nested2: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1_nested2 + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - get_input: contrail_net_name + - get_input: contrail_net_name + port_cmaui_port_network_role_tag: contrail + vm_flavor_name: + get_input: cmaui_1c1_nested2_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_nested2_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_nested2_name: + - get_input: + - cmaui_1c1_nested2_names + - 1 + - get_input: + - cmaui_1c1_nested2_names + - 0 + port_cmaui_port_subinterface_indicator: + - true + - true + compute_cmaui_1c1_nested2_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + service_template_filter: + substitute_service_template: Nested_cmaui_1c1_nested2ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + nested2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested2.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - test_resourceGroup + - test_nested_pattern_4_nested2 + - test_nested3Level + - test_nested_pattern_4_same_type_diff_file + - abstract_cmaui_1c1_nested2 + - abstract_pd_server_nested2_1b + - abstract_ps_server_nested2_1b + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested2 + capabilities: + instance_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - instance_cmaui_1c1_nested2 + disk.allocation_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.allocation_ps_server_nested2_1b + scalable_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - scalable_server_pd_pattern4_1 + network.incoming.packets.rate_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.incoming.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + os_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - os_pd_server_nested2_1b + disk.device.usage_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.usage_pd_server_nested2_1b + disk.device.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.write.bytes_server_pd_pattern4 + vcpus_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - vcpus_pd_server_nested2_1b + memory.usage_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - memory.usage_cmaui_1c1_nested2 + disk.device.latency_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.latency_cmaui_1c1_nested2 + memory.usage_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - memory.usage_cmaui_1c1_nested2 + instance_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - instance_cmaui_1c1_nested2 + disk.device.latency_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.latency_cmaui_1c1_nested2 + forwarder_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_port_2 + disk.iops_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.iops_ps_server_nested2_1b + disk.read.bytes_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.read.bytes_pd_server_nested2_1b + network.outgoing.packets.rate_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.outgoing.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port + memory.resident_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - memory.resident_ps_server_nested2_1b + network.outpoing.packets_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.outpoing.packets_pd_server_nested2_1b_pd_server_nested2_1b_port + disk.device.read.bytes_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.read.bytes_cmaui_1c1_nested2 + disk.device.read.bytes_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.read.bytes_cmaui_1c1_nested2 + endpoint_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - endpoint_pd_server_nested2_1b + cpu_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - cpu_server_pd_pattern4 + network.outgoing.bytes_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port + disk.device.allocation_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.allocation_pd_server_nested2_1b + network.outgoing.bytes_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes_cmaui_1c1_nested2_cmaui_port + disk.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.read.requests_server_pd_pattern4 + network.incoming.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_port_1 + disk.write.bytes.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.write.bytes.rate_ps_server_nested2_1b + network.incoming.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_port_2 + disk.device.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.write.requests_server_pd_pattern4_1 + forwarder_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - forwarder_pd_server_nested2_1b_pd_server_nested2_1b_port + memory.resident_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - memory.resident_server_pd_pattern4_1 + feature_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature + network.outgoing.bytes.rate_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.outgoing.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port + memory_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - memory_server_pd_pattern4 + disk.write.bytes.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.write.bytes.rate_cmaui_1c1_nested2 + disk.write.bytes.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.write.bytes.rate_cmaui_1c1_nested2 + attachment_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - attachment_ps_server_nested2_1b_ps_server_nested2_1b_port + binding_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_port_1 + forwarder_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_port_01 + attachment_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - attachment_pd_server_pattern4_port_02 + disk.device.iops_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.iops_ps_server_nested2_1b + disk.ephemeral.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.ephemeral.size_server_pd_pattern4_1 + disk.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.read.bytes.rate_server_pd_pattern4_1 + os_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - os_server_pd_pattern4_1 + cpu_util_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - cpu_util_pd_server_nested2_1b + network.incoming.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_port_01 + network.incoming.packets_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.incoming.packets_pd_server_nested2_1b_pd_server_nested2_1b_port + disk.write.bytes.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.write.bytes.rate_pd_server_nested2_1b + network.incoming.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_port_02 + disk.device.capacity_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.capacity_cmaui_1c1_nested2 + disk.device.capacity_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.capacity_cmaui_1c1_nested2 + binding_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_port_02 + network.outpoing.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_port_1 + disk.device.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.write.requests.rate_server_pd_pattern4_1 + disk.write.bytes_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.write.bytes_ps_server_nested2_1b + disk.latency_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.latency_pd_server_nested2_1b + network.incoming.packets_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_port_1 + network.incoming.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets_pd_server_pattern4_port_2 + binding_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_port + binding_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2_cmaui_port + network.outgoing.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_port_1 + disk.device.capacity_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.capacity_ps_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_port_1 + network.outpoing.packets_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outpoing.packets_pd_server_pattern4_port_2 + disk.read.requests_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.read.requests_ps_server_nested2_1b + network.incoming.bytes_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.incoming.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port + network.outgoing.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_port_02 + feature_test_resourceGroup: + - test_resourceGroup + - feature + disk.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.read.bytes_server_pd_pattern4_1 + network.incoming.bytes_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port + disk.device.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.write.requests.rate_server_pd_pattern4 + disk.device.read.bytes.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.read.bytes.rate_pd_server_nested2_1b + network.incoming.bytes_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes_cmaui_1c1_nested2_cmaui_port + disk.write.requests.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.write.requests.rate_pd_server_nested2_1b + scalable_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - scalable_server_pd_pattern4 + disk.device.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.iops_server_pd_pattern4_1 + disk.allocation_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.allocation_cmaui_1c1_nested2 + disk.usage_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.usage_ps_server_nested2_1b + disk.allocation_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.allocation_cmaui_1c1_nested2 + network.incoming.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets.rate_pd_server_pattern4_port_01 + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.write.bytes.rate_cmaui_1c1_nested2 + network.incoming.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port + network.incoming.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets.rate_cmaui_1c1_nested2_cmaui_port + disk.device.write.bytes.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.write.bytes.rate_cmaui_1c1_nested2 + feature_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_port + feature_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2_cmaui_port + os_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - os_ps_server_nested2_1b + disk.device.read.requests_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.read.requests_ps_server_nested2_1b + network.outgoing.packets.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_port_01 + disk.ephemeral.size_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.ephemeral.size_ps_server_nested2_1b + disk.device.iops_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.iops_pd_server_nested2_1b + network.incoming.packets.rate_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.packets.rate_pd_server_pattern4_port_1 + feature_jsa_security_group1_test_resourceGroup: + - test_resourceGroup + - feature_jsa_security_group1 + disk.write.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.write.requests.rate_server_pd_pattern4_1 + disk.device.usage_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.usage_ps_server_nested2_1b + feature_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature_pd_server_pattern4_port_2 + disk.device.write.requests.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.write.requests.rate_cmaui_1c1_nested2 + disk.device.write.requests.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.write.requests.rate_cmaui_1c1_nested2 + memory.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - memory.usage_server_pd_pattern4_1 + disk.latency_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.latency_server_pd_pattern4 + cpu_util_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - cpu_util_server_pd_pattern4 + binding_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2 + binding_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - binding_cmaui_1c1_nested2 + feature_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2 + disk.write.requests.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.write.requests.rate_cmaui_1c1_nested2 + feature_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - feature_cmaui_1c1_nested2 + disk.write.requests.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.write.requests.rate_cmaui_1c1_nested2 + disk.root.size_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.root.size_pd_server_nested2_1b + disk.device.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.write.requests_server_pd_pattern4 + memory.usage_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - memory.usage_ps_server_nested2_1b + disk.read.bytes.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.read.bytes.rate_cmaui_1c1_nested2 + cpu_util_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - cpu_util_server_pd_pattern4_1 + disk.read.bytes.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.read.bytes.rate_cmaui_1c1_nested2 + endpoint_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - endpoint_ps_server_nested2_1b + network.incoming.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_port_02 + forwarder_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_port + network.incoming.bytes_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.incoming.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - forwarder_cmaui_1c1_nested2_cmaui_port + vcpus_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - vcpus_cmaui_1c1_nested2 + vcpus_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - vcpus_ps_server_nested2_1b + vcpus_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - vcpus_cmaui_1c1_nested2 + disk.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.write.bytes.rate_server_pd_pattern4_1 + disk.iops_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.iops_server_pd_pattern4 + disk.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.allocation_server_pd_pattern4_1 + disk.usage_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.usage_server_pd_pattern4 + network.outgoing.bytes_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.outgoing.bytes_ps_server_nested2_1b_ps_server_nested2_1b_port + disk.write.requests_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.write.requests_pd_server_nested2_1b + disk.device.write.bytes_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.write.bytes_ps_server_nested2_1b + network.outgoing.bytes_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_port_02 + disk.latency_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.latency_ps_server_nested2_1b + memory.resident_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - memory.resident_cmaui_1c1_nested2 + network.incoming.bytes.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_port_02 + disk.device.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.allocation_server_pd_pattern4 + disk.device.read.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.read.bytes.rate_server_pd_pattern4_1 + feature_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - feature_pd_server_nested2_1b_pd_server_nested2_1b_port + cpu_util_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - cpu_util_ps_server_nested2_1b + disk.device.write.requests.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.write.requests.rate_pd_server_nested2_1b + disk.read.requests_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.read.requests_pd_server_nested2_1b + disk.device.read.requests.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.read.requests.rate_server_pd_pattern4_1 + disk.device.capacity_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.capacity_pd_server_nested2_1b + disk.capacity_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.capacity_ps_server_nested2_1b + instance_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - instance_server_pd_pattern4_1 + disk.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.read.requests_server_pd_pattern4_1 + os_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - os_cmaui_1c1_nested2 + disk.device.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.latency_server_pd_pattern4_1 + disk.read.bytes_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.read.bytes_ps_server_nested2_1b + os_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - os_cmaui_1c1_nested2 + network.incoming.bytes.rate_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.incoming.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + attachment_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - attachment_pd_server_nested2_1b_pd_server_nested2_1b_port + attachment_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - attachment_pd_server_pattern4_port_01 + feature_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature_pd_server_pattern4_port_02 + feature_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature_server_pd_pattern4_1 + disk.allocation_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.allocation_server_pd_pattern4 + network.outpoing.packets_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port + network.outpoing.packets_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.outpoing.packets_cmaui_1c1_nested2_cmaui_port + disk.iops_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.iops_server_pd_pattern4_1 + disk.ephemeral.size_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.ephemeral.size_pd_server_nested2_1b + memory.resident_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - memory.resident_pd_server_nested2_1b + network.outgoing.packets.rate_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.outgoing.packets.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + disk.device.usage_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.usage_cmaui_1c1_nested2 + disk.device.usage_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.usage_cmaui_1c1_nested2 + feature_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature_server_pd_pattern4 + disk.write.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.write.requests.rate_server_pd_pattern4 + network.outpoing.packets_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.outpoing.packets_ps_server_nested2_1b_ps_server_nested2_1b_port + feature_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - feature_ps_server_nested2_1b + memory.resident_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - memory.resident_cmaui_1c1_nested2 + disk.device.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.write.bytes_server_pd_pattern4_1 + disk.device.latency_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.latency_server_pd_pattern4 + host_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - host_server_pd_pattern4_1 + disk.latency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.latency_server_pd_pattern4_1 + disk.device.iops_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.iops_cmaui_1c1_nested2 + disk.device.iops_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.iops_cmaui_1c1_nested2 + disk.device.usage_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.usage_server_pd_pattern4 + disk.device.write.bytes.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.write.bytes.rate_pd_server_nested2_1b + forwarder_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - forwarder_ps_server_nested2_1b_ps_server_nested2_1b_port + attachment_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - attachment_pd_server_pattern4_port_2 + network.outgoing.bytes.rate_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.outgoing.bytes.rate_pd_server_nested2_1b_pd_server_nested2_1b_port + network.incoming.packets.rate_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.incoming.packets.rate_ps_server_nested2_1b_ps_server_nested2_1b_port + binding_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_pd_server_pattern4_port_01 + disk.device.read.requests_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.read.requests_cmaui_1c1_nested2 + binding_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - binding_ps_server_nested2_1b_ps_server_nested2_1b_port + host_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - host_server_pd_pattern4 + disk.device.read.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.read.requests_server_pd_pattern4 + cpu.delta_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - cpu.delta_server_pd_pattern4_1 + disk.usage_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.usage_pd_server_nested2_1b + disk.device.read.bytes.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.read.bytes.rate_ps_server_nested2_1b + network.outgoing.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes.rate_pd_server_pattern4_port_2 + network.incoming.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes_pd_server_pattern4_port_01 + disk.write.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.write.bytes_server_pd_pattern4 + disk.device.read.requests_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.read.requests_cmaui_1c1_nested2 + feature_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - feature_pd_server_pattern4_port_1 + network.outgoing.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes.rate_pd_server_pattern4_port_01 + scalable_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - scalable_cmaui_1c1_nested2 + cpu.delta_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - cpu.delta_cmaui_1c1_nested2 + cpu.delta_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - cpu.delta_cmaui_1c1_nested2 + cpu_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - cpu_pd_server_nested2_1b + network.outpoing.packets_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_port_01 + disk.device.latency_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.latency_ps_server_nested2_1b + disk.capacity_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.capacity_pd_server_nested2_1b + memory.usage_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - memory.usage_pd_server_nested2_1b + disk.write.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.write.bytes_server_pd_pattern4_1 + cpu_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - cpu_server_pd_pattern4_1 + binding_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_server_pd_pattern4_1 + cpu.delta_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - cpu.delta_server_pd_pattern4 + scalable_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - scalable_cmaui_1c1_nested2 + host_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - host_cmaui_1c1_nested2 + host_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - host_cmaui_1c1_nested2 + disk.capacity_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.capacity_cmaui_1c1_nested2 + feature_jsa_security_group1_test_nested3Level: + - test_nested3Level + - feature_jsa_security_group1 + network.outgoing.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_port_2 + disk.capacity_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.capacity_cmaui_1c1_nested2 + disk.device.allocation_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.allocation_server_pd_pattern4_1 + disk.device.read.bytes_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.read.bytes_ps_server_nested2_1b + disk.device.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.usage_server_pd_pattern4_1 + disk.device.read.requests_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.read.requests_pd_server_nested2_1b + disk.write.requests_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.write.requests_server_pd_pattern4 + feature_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature_pd_server_pattern4_port_01 + endpoint_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - endpoint_cmaui_1c1_nested2 + network.incoming.packets_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_port + disk.device.write.requests.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.write.requests.rate_ps_server_nested2_1b + network.incoming.packets_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.incoming.packets_ps_server_nested2_1b_ps_server_nested2_1b_port + binding_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - binding_pd_server_nested2_1b + network.incoming.packets_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.incoming.packets_cmaui_1c1_nested2_cmaui_port + feature_jsa_security_group2_test_nested3Level: + - test_nested3Level + - feature_jsa_security_group2 + feature_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - feature + disk.root.size_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.root.size_ps_server_nested2_1b + endpoint_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - endpoint_cmaui_1c1_nested2 + disk.device.write.bytes_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.write.bytes_pd_server_nested2_1b + disk.ephemeral.size_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.ephemeral.size_server_pd_pattern4 + disk.usage_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.usage_cmaui_1c1_nested2 + disk.usage_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.usage_cmaui_1c1_nested2 + disk.device.write.requests_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.write.requests_pd_server_nested2_1b + network.incoming.bytes_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_pd_server_pattern4_port_2 + disk.root.size_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.root.size_server_pd_pattern4_1 + cpu.delta_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - cpu.delta_pd_server_nested2_1b + disk.write.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.write.requests_server_pd_pattern4_1 + network.incoming.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes_pd_server_pattern4_port_1 + host_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - host_ps_server_nested2_1b + disk.device.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.write.bytes.rate_server_pd_pattern4 + feature_jsa_security_group2_test_resourceGroup: + - test_resourceGroup + - feature_jsa_security_group2 + feature_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - feature_pd_server_nested2_1b + disk.device.read.requests.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.read.requests.rate_ps_server_nested2_1b + disk.read.requests_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.read.requests_cmaui_1c1_nested2 + disk.device.read.requests.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.read.requests.rate_cmaui_1c1_nested2 + network.incoming.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.packets_pd_server_pattern4_port_02 + disk.read.requests_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.read.requests_cmaui_1c1_nested2 + disk.device.read.requests.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.read.requests.rate_cmaui_1c1_nested2 + cpu_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - cpu_cmaui_1c1_nested2 + network.outgoing.packets.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.packets.rate_pd_server_pattern4_port_2 + cpu_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - cpu_cmaui_1c1_nested2 + instance_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - instance_pd_server_nested2_1b + memory_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - memory_cmaui_1c1_nested2 + memory_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - memory_cmaui_1c1_nested2 + disk.device.write.requests_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.write.requests_cmaui_1c1_nested2 + memory_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - memory_server_pd_pattern4_1 + disk.device.write.requests_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.write.requests_cmaui_1c1_nested2 + network.outgoing.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port + disk.write.requests_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.write.requests_ps_server_nested2_1b + disk.device.read.requests.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.read.requests.rate_server_pd_pattern4 + network.outgoing.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.outgoing.bytes.rate_cmaui_1c1_nested2_cmaui_port + disk.device.write.bytes_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.write.bytes_cmaui_1c1_nested2 + memory_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - memory_ps_server_nested2_1b + binding_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - binding_server_pd_pattern4 + disk.read.bytes_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.read.bytes_cmaui_1c1_nested2 + endpoint_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - endpoint_server_pd_pattern4_1 + disk.read.bytes_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.read.bytes_cmaui_1c1_nested2 + disk.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.read.bytes.rate_server_pd_pattern4 + disk.device.write.bytes_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.write.bytes_cmaui_1c1_nested2 + vcpus_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - vcpus_server_pd_pattern4_1 + os_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - os_server_pd_pattern4 + forwarder_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - forwarder_pd_server_pattern4_port_1 + disk.device.read.requests_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.read.requests_server_pd_pattern4_1 + attachment_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - attachment_pd_server_pattern4_port_1 + disk.write.requests_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.write.requests_cmaui_1c1_nested2 + disk.write.requests_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.write.requests_cmaui_1c1_nested2 + memory.resident_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - memory.resident_server_pd_pattern4 + scalable_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - scalable_ps_server_nested2_1b + instance_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - instance_server_pd_pattern4 + disk.ephemeral.size_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.ephemeral.size_cmaui_1c1_nested2 + disk.ephemeral.size_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.ephemeral.size_cmaui_1c1_nested2 + network.outpoing.packets_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outpoing.packets_pd_server_pattern4_port_02 + disk.device.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.capacity_server_pd_pattern4 + memory.usage_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - memory.usage_server_pd_pattern4 + disk.device.read.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.read.bytes.rate_server_pd_pattern4 + forwarder_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - forwarder_pd_server_pattern4_port_02 + disk.capacity_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.capacity_server_pd_pattern4 + attachment_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_port + disk.allocation_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.allocation_pd_server_nested2_1b + cpu_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - cpu_ps_server_nested2_1b + disk.device.write.bytes.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.write.bytes.rate_ps_server_nested2_1b + disk.write.bytes.rate_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.write.bytes.rate_server_pd_pattern4 + disk.read.bytes.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.read.bytes.rate_ps_server_nested2_1b + disk.device.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.read.bytes_server_pd_pattern4 + network.incoming.bytes.rate_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.incoming.bytes.rate_pd_server_pattern4_port_2 + network.outgoing.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port + network.outgoing.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.outgoing.packets.rate_cmaui_1c1_nested2_cmaui_port + attachment_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - attachment_cmaui_1c1_nested2_cmaui_port + disk.device.iops_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.device.iops_server_pd_pattern4 + disk.device.read.bytes_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.read.bytes_server_pd_pattern4_1 + disk.root.size_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.root.size_cmaui_1c1_nested2 + disk.root.size_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.root.size_cmaui_1c1_nested2 + disk.device.latency_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.latency_pd_server_nested2_1b + disk.write.bytes_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.write.bytes_cmaui_1c1_nested2 + network.outgoing.bytes_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - network.outgoing.bytes_pd_server_pattern4_port_1 + disk.usage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.usage_server_pd_pattern4_1 + disk.write.bytes_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.write.bytes_cmaui_1c1_nested2 + disk.iops_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.iops_cmaui_1c1_nested2 + feature_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - feature_ps_server_nested2_1b_ps_server_nested2_1b_port + disk.iops_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.iops_cmaui_1c1_nested2 + network.outgoing.bytes_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.bytes_pd_server_pattern4_port_01 + disk.iops_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.iops_pd_server_nested2_1b + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.read.bytes.rate_cmaui_1c1_nested2 + binding_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - binding_pd_server_pattern4_port_2 + disk.device.read.bytes.rate_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.read.bytes.rate_cmaui_1c1_nested2 + disk.latency_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.latency_cmaui_1c1_nested2 + vcpus_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - vcpus_server_pd_pattern4 + feature_test_nested3Level: + - test_nested3Level + - feature + disk.device.write.requests_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.write.requests_ps_server_nested2_1b + endpoint_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - endpoint_server_pd_pattern4 + disk.device.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.capacity_server_pd_pattern4_1 + memory_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - memory_pd_server_nested2_1b + disk.write.requests.rate_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.write.requests.rate_ps_server_nested2_1b + cpu_util_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - cpu_util_cmaui_1c1_nested2 + disk.device.read.bytes_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.read.bytes_pd_server_nested2_1b + disk.latency_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.latency_cmaui_1c1_nested2 + cpu_util_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - cpu_util_cmaui_1c1_nested2 + instance_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - instance_ps_server_nested2_1b + network.incoming.bytes.rate_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.incoming.bytes.rate_pd_server_pattern4_port_01 + network.incoming.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port + network.incoming.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - network.incoming.bytes.rate_cmaui_1c1_nested2_cmaui_port + host_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - host_pd_server_nested2_1b + disk.write.bytes_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.write.bytes_pd_server_nested2_1b + disk.read.bytes.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.read.bytes.rate_pd_server_nested2_1b + binding_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - binding_pd_server_nested2_1b_pd_server_nested2_1b_port + disk.root.size_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.root.size_server_pd_pattern4 + network.incoming.bytes.rate_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - network.incoming.bytes.rate_ps_server_nested2_1b_ps_server_nested2_1b_port + disk.device.read.requests.rate_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - disk.device.read.requests.rate_pd_server_nested2_1b + binding_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - binding_ps_server_nested2_1b + disk.device.write.bytes.rate_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.device.write.bytes.rate_server_pd_pattern4_1 + disk.read.bytes_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - disk.read.bytes_server_pd_pattern4 + disk.device.allocation_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - disk.device.allocation_ps_server_nested2_1b + scalable_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - scalable_pd_server_nested2_1b + disk.capacity_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - disk.capacity_server_pd_pattern4_1 + network.outgoing.bytes_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - network.outgoing.bytes_pd_server_nested2_1b_pd_server_nested2_1b_port + network.outgoing.packets.rate_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - network.outgoing.packets.rate_pd_server_pattern4_port_02 + disk.device.allocation_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - disk.device.allocation_cmaui_1c1_nested2 + cpu.delta_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - cpu.delta_ps_server_nested2_1b + disk.device.allocation_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - disk.device.allocation_cmaui_1c1_nested2 + requirements: + dependency_jsa_security_group1_test_resourceGroup: + - test_resourceGroup + - dependency_jsa_security_group1 + port_jsa_security_group2_test_resourceGroup: + - test_resourceGroup + - port_jsa_security_group2 + dependency_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2 + dependency_jsa_security_group2_test_nested3Level: + - test_nested3Level + - dependency_jsa_security_group2 + port_jsa_security_group1_test_resourceGroup: + - test_resourceGroup + - port_jsa_security_group1 + link_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - link_ps_server_nested2_1b_ps_server_nested2_1b_port + dependency_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - dependency_ps_server_nested2_1b + dependency_jsa_security_group2_test_resourceGroup: + - test_resourceGroup + - dependency_jsa_security_group2 + local_storage_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - local_storage_server_pd_pattern4 + dependency_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2 + dependency_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_port_01 + port_jsa_security_group2_test_nested3Level: + - test_nested3Level + - port_jsa_security_group2 + dependency_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - dependency_pd_server_nested2_1b + link_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_port + link_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - link_pd_server_pattern4_port_02 + link_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - link_cmaui_1c1_nested2_cmaui_port + local_storage_server_nested2_ps_1b: + - abstract_ps_server_nested2_1b + - local_storage_ps_server_nested2_1b + dependency_test_resourceGroup: + - test_resourceGroup + - dependency + local_storage_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - local_storage_server_pd_pattern4_1 + dependency_pd_server_pattern4_port_02_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency_pd_server_pattern4_port_02 + dependency_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - dependency_pd_server_pattern4_port_1 + dependency_cmaui_port_1: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_port + link_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - link_pd_server_nested2_1b_pd_server_nested2_1b_port + dependency_server_pd_pattern4_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency_server_pd_pattern4 + dependency_test_nested3Level: + - test_nested3Level + - dependency + dependency_cmaui_port_2: + - abstract_cmaui_1c1_nested2 + - dependency_cmaui_1c1_nested2_cmaui_port + dependency_pd_server_nested2_1b_port: + - abstract_pd_server_nested2_1b + - dependency_pd_server_nested2_1b_pd_server_nested2_1b_port + port_jsa_security_group1_test_nested3Level: + - test_nested3Level + - port_jsa_security_group1 + dependency_server_pd_pattern4_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - dependency_server_pd_pattern4_1 + link_pd_server_pattern4_port_01_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - link_pd_server_pattern4_port_01 + dependency_ps_server_nested2_1b_port: + - abstract_ps_server_nested2_1b + - dependency_ps_server_nested2_1b_ps_server_nested2_1b_port + dependency_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - dependency_pd_server_pattern4_port_2 + link_pd_server_pattern4_port_2_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - link_pd_server_pattern4_port_2 + dependency_jsa_security_group1_test_nested3Level: + - test_nested3Level + - dependency_jsa_security_group1 + link_pd_server_pattern4_port_1_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - link_pd_server_pattern4_port_1 + local_storage_server_nested2_1c1_cmaui_2: + - abstract_cmaui_1c1_nested2 + - local_storage_cmaui_1c1_nested2 + local_storage_server_nested2_pd_1b: + - abstract_pd_server_nested2_1b + - local_storage_pd_server_nested2_1b + dependency_test_nested_pattern_4_same_type_diff_file: + - test_nested_pattern_4_same_type_diff_file + - dependency + local_storage_server_nested2_1c1_cmaui_1: + - abstract_cmaui_1c1_nested2 + - local_storage_cmaui_1c1_nested2 + dependency_test_nested_pattern_4_nested2: + - test_nested_pattern_4_nested2 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 76b4b4c1eb..680d88be08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -381,6 +387,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -909,6 +916,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -922,6 +930,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1023,6 +1032,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_oam_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -1269,6 +1284,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1822,6 +1838,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1871,6 +1888,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2255,6 +2273,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2983,6 +3002,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3137,6 +3157,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3202,6 +3223,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3507,6 +3529,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3949,6 +3972,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4027,6 +4051,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4181,6 +4206,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4555,6 +4581,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -4638,6 +4670,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5007,6 +5040,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -5316,6 +5355,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml index 04d15b6c5a..334615f25f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: json + port_oam_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_oam_server_port_exCP_naming vlan_requirements: get_input: port_oam_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: get_input: port_oam_server_port_network_role_tag network_role: get_input: port_oam_server_port_network_role + subnetpoolid: + get_input: port_oam_server_port_subnetpoolid fixed_ips: get_input: - port_oam_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_oam_server_port_subnetpoolid network: get_input: - port_oam_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml index 0acd6bd36f..51b0e191db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -49,6 +49,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag network_role: get_input: port_pd_server_port_network_role + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml index 81ff505e41..31dc6da30a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml @@ -63,6 +63,11 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -102,18 +107,22 @@ topology_template: get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag network_role: get_input: port_ps_server_port_network_role + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml index 430a3a7d6c..e486f79a06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_sm_server_port_exCP_naming vlan_requirements: get_input: port_sm_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_sm_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: get_input: port_sm_server_port_network_role_tag network_role: get_input: port_sm_server_port_network_role + subnetpoolid: + get_input: port_sm_server_port_subnetpoolid fixed_ips: get_input: - port_sm_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_sm_server_port_subnetpoolid network: get_input: - port_sm_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml index a91f75a13c..9df6d0ce19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml @@ -117,6 +117,8 @@ topology_template: - get_input: net1 vm_flavor_name: get_input: pd_server_flavor + port_pd_server_port_subinterface_indicator: + - true port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -159,6 +161,8 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor + port_ps_server_port_subinterface_indicator: + - true port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml index 50bf03440a..87a1cf5554 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml @@ -141,6 +141,8 @@ topology_template: get_input: sm_server_flavor port_sm_server_port_network: - get_input: net1 + port_sm_server_port_subinterface_indicator: + - true compute_sm_server_name: - get_input: - sm_server_names @@ -190,6 +192,8 @@ topology_template: - get_input: net2 port_oam_server_port_security_groups: - - get_input: p1 + port_oam_server_port_subinterface_indicator: + - true port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index edff14322c..0697992c11 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,6 +48,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -187,6 +193,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -494,6 +501,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -754,6 +767,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -908,6 +922,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -1149,6 +1169,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1368,6 +1389,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_oam02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean requirements: - dependency_oam_oam02_port: capability: tosca.capabilities.Node @@ -1449,6 +1476,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1760,6 +1788,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -1845,6 +1879,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2232,6 +2267,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean requirements: - dependency_cmaui_cmaui02_port: capability: tosca.capabilities.Node @@ -2388,6 +2429,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2614,6 +2656,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui01_port_vlan_requirements: type: list required: true @@ -2921,6 +2969,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3260,6 +3309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3485,6 +3535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3602,6 +3653,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4187,6 +4239,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4236,6 +4289,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4982,6 +5036,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5337,6 +5392,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5735,6 +5791,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6157,6 +6214,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6485,6 +6543,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6572,6 +6631,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -6782,6 +6847,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7251,6 +7317,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7536,6 +7603,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index 66010f08b0..1c31067e93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -145,6 +145,8 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -201,6 +203,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index 7a52164ac8..6d81c28d86 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -82,6 +82,11 @@ topology_template: port_cmaui02_port_network_role_tag: type: string required: true + port_cmaui02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean node_templates: cmaui_cmaui02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -102,18 +107,22 @@ topology_template: get_input: port_cmaui02_port_exCP_naming vlan_requirements: get_input: port_cmaui02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui02_port_ip_requirements network_role_tag: get_input: port_cmaui02_port_network_role_tag network_role: get_input: port_cmaui02_port_network_role + subnetpoolid: + get_input: port_cmaui02_port_subnetpoolid fixed_ips: get_input: - port_cmaui02_port_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui02_port_subnetpoolid network: get_input: - port_cmaui02_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 23b20bfb0b..7ea3d38bc9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -42,6 +42,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui01_port_vlan_requirements: type: list required: true @@ -102,18 +107,22 @@ topology_template: get_input: port_cmaui01_port_exCP_naming vlan_requirements: get_input: port_cmaui01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui01_port_ip_requirements network_role_tag: get_input: port_cmaui01_port_network_role_tag network_role: get_input: port_cmaui01_port_network_role + subnetpoolid: + get_input: port_cmaui01_port_subnetpoolid fixed_ips: get_input: - port_cmaui01_port_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui01_port_subnetpoolid network: get_input: - port_cmaui01_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index b8f2ec2212..c5aee48015 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -82,6 +82,11 @@ topology_template: required: true entry_schema: type: string + port_oam02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean node_templates: oam_oam02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -102,18 +107,22 @@ topology_template: get_input: port_oam02_port_exCP_naming vlan_requirements: get_input: port_oam02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam02_port_ip_requirements network_role_tag: get_input: port_oam02_port_network_role_tag network_role: get_input: port_oam02_port_network_role + subnetpoolid: + get_input: port_oam02_port_subnetpoolid fixed_ips: get_input: - port_oam02_port_fixed_ips - index_value - subnetpoolid: - get_input: port_oam02_port_subnetpoolid network: get_input: - port_oam02_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index 1a18291c07..7089c10490 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: vm_flavor_name: type: string required: true + port_oam01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -102,18 +107,22 @@ topology_template: get_input: port_oam01_port_exCP_naming vlan_requirements: get_input: port_oam01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam01_port_ip_requirements network_role_tag: get_input: port_oam01_port_network_role_tag network_role: get_input: port_oam01_port_network_role + subnetpoolid: + get_input: port_oam01_port_subnetpoolid fixed_ips: get_input: - port_oam01_port_fixed_ips - index_value - subnetpoolid: - get_input: port_oam01_port_subnetpoolid network: get_input: - port_oam01_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index f31f70b12a..0858b9dd3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -43,6 +43,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index 7dcab1874c..c5324d5469 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index a873bba30a..5e20bc5571 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag network_role: get_input: port_pd02_port_network_role + subnetpoolid: + get_input: port_pd02_port_subnetpoolid fixed_ips: get_input: - port_pd02_port_fixed_ips - index_value - subnetpoolid: - get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 6140c8d750..4a195fb22d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag network_role: get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid fixed_ips: get_input: - port_pd01_port_fixed_ips - index_value - subnetpoolid: - get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index c157b3e4d5..e847f26e4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - - get_input: p2 port_cmaui02_port_network: - get_input: net + port_cmaui02_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -121,6 +123,8 @@ topology_template: - get_input: - cmaui_names - 0 + port_cmaui01_port_subinterface_indicator: + - true compute_cmaui_availability_zone: - get_input: availability_zone_0 vm_image_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 95f54953da..6201798e24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -85,6 +85,8 @@ topology_template: - AUTO vm_flavor_name: get_input: cmaui_flavor + port_oam01_port_subinterface_indicator: + - true vm_image_name: get_input: cmaui_image port_oam01_port_fixed_ips: @@ -146,6 +148,8 @@ topology_template: - get_input: - oam_names - 0 + port_oam02_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_oamServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index 581fda52b8..55bafc0278 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -72,6 +72,8 @@ topology_template: is_required: false vm_flavor_name: get_input: cmaui_flavor + port_pd02_port_subinterface_indicator: + - true vm_image_name: get_input: cmaui_image port_pd02_port_security_groups: @@ -146,6 +148,8 @@ topology_template: - get_input: - ps_names - 0 + port_pd01_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_ps_1ServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index d2e67730bf..89b4e9e2c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -492,6 +499,12 @@ node_types: type: integer required: true status: SUPPORTED + port_ps02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_pd_server_user_data_format: type: list required: true @@ -548,6 +561,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -888,6 +902,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -1027,6 +1047,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1316,6 +1337,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -1557,6 +1584,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1736,6 +1764,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -1977,6 +2011,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2148,6 +2183,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -2287,6 +2328,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2568,6 +2610,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -2707,6 +2755,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2996,6 +3045,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -3237,6 +3292,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3877,6 +3933,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3890,6 +3947,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4834,6 +4892,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4957,6 +5016,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5254,6 +5314,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5278,6 +5339,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5806,6 +5868,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5926,6 +5989,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6767,6 +6831,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6810,6 +6875,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7164,6 +7230,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7357,6 +7424,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 34a7a39a4a..6170503016 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -145,6 +145,8 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -201,6 +203,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index f45ff43b37..62d5fee5a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -43,6 +43,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml index 46b79ee2f3..445bcc54d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml @@ -43,6 +43,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml index 7e44f83659..1fdc6999a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml index 1747965094..7dd0802b4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml index 65c26ad0d0..252a651fa2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml @@ -62,6 +62,11 @@ topology_template: port_ps02_port_order: type: integer required: true + port_ps02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_pd_server_user_data_format: type: list required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_ps02_port_exCP_naming vlan_requirements: get_input: port_ps02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml index ea3a5f1999..bbc69567f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml @@ -43,6 +43,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd02_port_vlan_requirements: type: list required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml index 9a3d253413..a5c0eb8564 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml index a1fe8309fe..468b4263b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -88,6 +88,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -129,6 +131,8 @@ topology_template: port_ps02_port_network_role_tag: oam vm_image_name: get_input: pd_image_name + port_ps02_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW port_ps02_port_network: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml index 3c455bbc79..55e65ce5bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -83,6 +83,8 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: @@ -139,6 +141,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml index f841dbd9f5..f2a632a178 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -88,6 +88,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -116,6 +118,8 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_pd02_port_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index 68d79fd16b..2edec5c600 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -26,6 +26,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -197,6 +203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -452,6 +459,12 @@ node_types: type: string required: true status: SUPPORTED + port_osm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -703,6 +716,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -936,6 +950,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_oam_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -1230,6 +1250,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1666,6 +1687,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1673,6 +1695,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1882,6 +1905,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2152,6 +2181,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2374,6 +2404,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_BE_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean attributes: BE_1c1_accessIPv4: type: string @@ -2511,6 +2547,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3052,6 +3089,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3223,6 +3261,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3230,6 +3269,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3500,6 +3540,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3543,6 +3584,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3550,6 +3592,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5002,6 +5045,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5317,6 +5361,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5354,6 +5399,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -5518,6 +5569,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5794,6 +5846,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_rd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true @@ -6118,6 +6176,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6405,6 +6464,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6418,6 +6478,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6839,6 +6900,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6846,6 +6908,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7393,6 +7456,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7400,6 +7464,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7671,6 +7736,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -7712,6 +7783,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 30b94e7b0a..38a8f8e6d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -1,760 +1,771 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- p1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: p1
- type: string
- description: UID of osm network
- p2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: p2
- type: string
- description: UID of osm network
- rd_server_1b_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: rd_server_1b_flavor
- type: string
- description: Flavor for PD server
- BE_1c1_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: BE_1c1_names
- type: list
- description: BE1, BE2 server names
- entry_schema:
- type: string
- ps_server_1b_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: ps_server_1b_ips
- type: string
- packet_internal_network_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: packet_internal_network_name
- type: string
- security_group_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: security_group_name
- type: list
- description: BE1, BE2 server names
- entry_schema:
- type: string
- osm_server_1c2_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: osm_server_1c2_names
- type: list
- description: BE1, BE2 server names
- entry_schema:
- type: string
- osm_server_1c2_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: osm_server_1c2_flavor
- type: string
- description: Flavor for BE server
- rd_server_1b_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: rd_server_1b_ips
- type: string
- ps_server_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: ps_server_1b_names
- type: list
- description: Ps server names
- entry_schema:
- type: string
- rd_server_1b_names:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: rd_server_1b_names
- type: list
- description: PD server names
- entry_schema:
- type: string
- jsa_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: jsa_name
- type: string
- description: network name of jsa log network
- osm_server_1c2_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: osm_server_1c2_image
- type: string
- description: Image for BE server
- BE_osm_ips:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: BE_osm_ips
- type: string
- packet_external_network_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: packet_external_network_name
- type: string
- BE_1c1_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: BE_1c1_image
- type: string
- description: Image for BE server
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: availability_zone_0
- type: string
- description: availabilityzone name
- rd_server_1b_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: rd_server_1b_image
- type: string
- description: PD Image server
- ps_server_1b_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: ps_server_1b_flavor
- type: string
- description: Flavor for PS server
- ps_server_1b_image:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: ps_server_1b_image
- type: string
- description: Ps Image server
- net:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: net
- type: string
- BE_1c1_flavor:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - nested2
- source_type: HEAT
- param_name: BE_1c1_flavor
- type: string
- description: Flavor for BE server
- node_templates:
- abstract_rd_server_1b_1:
- type: org.openecomp.resource.abstract.nodes.rd_server_1b_1
- directives:
- - substitutable
- properties:
- port_ps_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_1b_ips
- - 0
- compute_rd_server_1b_availability_zone:
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: rd_server_1b_flavor
- port_ps_server_1b_port_network:
- - get_input: net
- port_ps_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: rd_server_1b_image
- port_ps_server_1b_port_replacement_policy:
- - AUTO
- compute_rd_server_1b_name:
- - get_input:
- - rd_server_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_rd_server_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- dependsOn_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: jsa_name
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: test_nested_all_patterns
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: test_nested_no_compute
- relationship: tosca.relationships.DependsOn
- - dependency:
- capability: tosca.capabilities.Node
- node: test_nested_pattern_4
- relationship: tosca.relationships.DependsOn
- abstract_rd_server_1b:
- type: org.openecomp.resource.abstract.nodes.rd_server_1b
- directives:
- - substitutable
- properties:
- port_rd_server_1b_port_network:
- - get_input: net
- compute_rd_server_1b_availability_zone:
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: rd_server_1b_flavor
- port_rd_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: rd_server_1b_image
- port_rd_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_rd_server_1b_name:
- - get_input:
- - rd_server_1b_names
- - 0
- port_rd_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - rd_server_1b_ips
- - 0
- port_rd_server_1b_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_rd_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- test_nested_pattern_4:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- p2:
- get_attribute:
- - test_nested_no_compute
- - no_compute_attr_1
- port_pd_server_port_2_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_2_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_1_mac_requirements:
- mac_count_required:
- is_required: false
- test_nested_no_compute:
- type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute
- directives:
- - substitutable
- properties:
- p1:
- get_attribute:
- - test_nested_pattern_4
- - pattern4_attr_1
- service_template_filter:
- substitute_service_template: nested-no-computeServiceTemplate.yaml
- nested2_pattern_4:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- p2:
- get_input: p2
- port_pd_server_port_2_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_2_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_1_mac_requirements:
- mac_count_required:
- is_required: false
- abstract_osm_server_1c2_0:
- type: org.openecomp.resource.abstract.nodes.osm_server_1c2
- directives:
- - substitutable
- properties:
- port_osm_port_replacement_policy:
- - AUTO
- port_osm_port_network:
- - packet_internal_network_2
- compute_osm_server_1c2_name:
- - get_input:
- - osm_server_1c2_names
- - 0
- vm_flavor_name:
- get_input: osm_server_1c2_flavor
- port_osm_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_osm_port_fixed_ips:
- - ip_address:
- get_input:
- - BE_osm_ips
- - 1
- vm_image_name:
- get_input: osm_server_1c2_image
- port_osm_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_osm_server_1c2_availability_zone:
- - get_input: availability_zone_0
- service_template_filter:
- substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_osm_server_1c2_osm_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network_2
- relationship: tosca.relationships.network.LinksTo
- abstract_osm_server_1c2_1:
- type: org.openecomp.resource.abstract.nodes.osm_server_1c2
- directives:
- - substitutable
- properties:
- port_osm_port_replacement_policy:
- - AUTO
- port_osm_port_network:
- - packet_external_network_2
- compute_osm_server_1c2_name:
- - get_input:
- - osm_server_1c2_names
- - 1
- vm_flavor_name:
- get_input: osm_server_1c2_flavor
- port_osm_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_osm_port_fixed_ips:
- - ip_address:
- get_input:
- - BE_osm_ips
- - 1
- vm_image_name:
- get_input: osm_server_1c2_image
- port_osm_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_osm_server_1c2_metadata:
- - connectivity_to_server_1c1_BE_1:
- get_attribute:
- - abstract_BE_1c1
- - BE_1c1_accessIPv4
- connectivity_to_pattern_4:
- get_attribute:
- - nested2_pattern_4
- - pattern4_attr_1
- connectivity_to_server_1c1_BE_2:
- get_attribute:
- - abstract_BE_1c1
- - BE_1c1_accessIPv4
- connectivity_to_rd_server_1b:
- get_attribute:
- - abstract_rd_server_1b
- - rd_server_1b_accessIPv4
- compute_osm_server_1c2_availability_zone:
- - get_input: availability_zone_0
- service_template_filter:
- substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_osm_server_1c2_osm_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_external_network_2
- relationship: tosca.relationships.network.LinksTo
- packet_internal_network_2:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_internal_network_name
- packet_external_network_2:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_external_network_name
- abstract_BE_1c1:
- type: org.openecomp.resource.abstract.nodes.BE_1c1
- directives:
- - substitutable
- properties:
- vm_flavor_name:
- get_input: BE_1c1_flavor
- port_BE_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_BE_port_fixed_ips:
- - - ip_address:
- get_input:
- - BE_osm_ips
- - 0
- - - ip_address:
- get_input:
- - BE_osm_ips
- - 0
- compute_BE_1c1_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- port_BE_port_network:
- - packet_internal_network_2
- - packet_internal_network_2
- port_BE_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: BE_1c1_image
- compute_BE_1c1_name:
- - get_input:
- - BE_1c1_names
- - 1
- - get_input:
- - BE_1c1_names
- - 0
- port_BE_port_replacement_policy:
- - AUTO
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_BE_1c1_BE_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network_2
- relationship: tosca.relationships.network.LinksTo
- test_nested_all_patterns:
- type: org.openecomp.resource.abstract.nodes.heat.nested1
- directives:
- - substitutable
- properties:
- p1:
- get_attribute:
- - test_nested_pattern_4
- - pattern4_attr_1
- service_template_filter:
- substitute_service_template: nested1ServiceTemplate.yaml
- p2:
- get_attribute:
- - test_nested_no_compute
- - no_compute_attr_1
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - dependsOn_network
- - test_nested_pattern_4
- - test_nested_no_compute
- - test_nested_all_patterns
- nested2_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested2.yml
- description: nested1
- members:
- - nested2_pattern_4
- - packet_internal_network_2
- - packet_external_network_2
- - abstract_rd_server_1b
- - abstract_rd_server_1b_1
- - abstract_osm_server_1c2_0
- - abstract_osm_server_1c2_1
- - abstract_BE_1c1
- outputs:
- all_pattern_attr_1:
- description: all_pattern_attr_1
- value:
- get_attribute:
- - abstract_osm_server_1c2_1
- - osm_server_1c2_accessIPv4
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + p1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p1 + type: string + description: UID of osm network + p2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: p2 + type: string + description: UID of osm network + rd_server_1b_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_flavor + type: string + description: Flavor for PD server + BE_1c1_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_names + type: list + description: BE1, BE2 server names + entry_schema: + type: string + ps_server_1b_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_ips + type: string + packet_internal_network_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_internal_network_name + type: string + security_group_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: security_group_name + type: list + description: BE1, BE2 server names + entry_schema: + type: string + osm_server_1c2_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_names + type: list + description: BE1, BE2 server names + entry_schema: + type: string + osm_server_1c2_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_flavor + type: string + description: Flavor for BE server + rd_server_1b_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_ips + type: string + ps_server_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_names + type: list + description: Ps server names + entry_schema: + type: string + rd_server_1b_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_names + type: list + description: PD server names + entry_schema: + type: string + jsa_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: jsa_name + type: string + description: network name of jsa log network + osm_server_1c2_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: osm_server_1c2_image + type: string + description: Image for BE server + BE_osm_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_osm_ips + type: string + packet_external_network_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: packet_external_network_name + type: string + BE_1c1_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_image + type: string + description: Image for BE server + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: availability_zone_0 + type: string + description: availabilityzone name + rd_server_1b_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: rd_server_1b_image + type: string + description: PD Image server + ps_server_1b_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_flavor + type: string + description: Flavor for PS server + ps_server_1b_image: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: ps_server_1b_image + type: string + description: Ps Image server + net: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: net + type: string + BE_1c1_flavor: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - nested2 + source_type: HEAT + param_name: BE_1c1_flavor + type: string + description: Flavor for BE server + node_templates: + abstract_rd_server_1b_1: + type: org.openecomp.resource.abstract.nodes.rd_server_1b_1 + directives: + - substitutable + properties: + port_ps_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true + port_ps_server_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + compute_rd_server_1b_availability_zone: + - get_input: availability_zone_0 + vm_flavor_name: + get_input: rd_server_1b_flavor + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: rd_server_1b_image + port_ps_server_1b_port_replacement_policy: + - AUTO + compute_rd_server_1b_name: + - get_input: + - rd_server_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_rd_server_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + dependsOn_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: jsa_name + requirements: + - dependency: + capability: tosca.capabilities.Node + node: test_nested_all_patterns + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: test_nested_no_compute + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: test_nested_pattern_4 + relationship: tosca.relationships.DependsOn + abstract_rd_server_1b: + type: org.openecomp.resource.abstract.nodes.rd_server_1b + directives: + - substitutable + properties: + port_rd_server_1b_port_network: + - get_input: net + compute_rd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_rd_server_1b_port_subinterface_indicator: + - true + vm_flavor_name: + get_input: rd_server_1b_flavor + port_rd_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: rd_server_1b_image + port_rd_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + compute_rd_server_1b_name: + - get_input: + - rd_server_1b_names + - 0 + port_rd_server_1b_port_fixed_ips: + - ip_address: + get_input: + - rd_server_1b_ips + - 0 + port_rd_server_1b_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_rd_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + test_nested_pattern_4: + type: org.openecomp.resource.abstract.nodes.heat.pd_server + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + p2: + get_attribute: + - test_nested_no_compute + - no_compute_attr_1 + port_pd_server_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_1_mac_requirements: + mac_count_required: + is_required: false + test_nested_no_compute: + type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute + directives: + - substitutable + properties: + p1: + get_attribute: + - test_nested_pattern_4 + - pattern4_attr_1 + service_template_filter: + substitute_service_template: nested-no-computeServiceTemplate.yaml + nested2_pattern_4: + type: org.openecomp.resource.abstract.nodes.heat.pd_server + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + p2: + get_input: p2 + port_pd_server_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_1_mac_requirements: + mac_count_required: + is_required: false + abstract_osm_server_1c2_0: + type: org.openecomp.resource.abstract.nodes.osm_server_1c2 + directives: + - substitutable + properties: + port_osm_port_replacement_policy: + - AUTO + port_osm_port_subinterface_indicator: + - true + port_osm_port_network: + - packet_internal_network_2 + compute_osm_server_1c2_name: + - get_input: + - osm_server_1c2_names + - 0 + vm_flavor_name: + get_input: osm_server_1c2_flavor + port_osm_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_osm_port_fixed_ips: + - ip_address: + get_input: + - BE_osm_ips + - 1 + vm_image_name: + get_input: osm_server_1c2_image + port_osm_port_mac_requirements: + mac_count_required: + is_required: false + compute_osm_server_1c2_availability_zone: + - get_input: availability_zone_0 + service_template_filter: + substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_osm_server_1c2_osm_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network_2 + relationship: tosca.relationships.network.LinksTo + abstract_osm_server_1c2_1: + type: org.openecomp.resource.abstract.nodes.osm_server_1c2 + directives: + - substitutable + properties: + port_osm_port_replacement_policy: + - AUTO + port_osm_port_subinterface_indicator: + - true + port_osm_port_network: + - packet_external_network_2 + compute_osm_server_1c2_name: + - get_input: + - osm_server_1c2_names + - 1 + vm_flavor_name: + get_input: osm_server_1c2_flavor + port_osm_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_osm_port_fixed_ips: + - ip_address: + get_input: + - BE_osm_ips + - 1 + vm_image_name: + get_input: osm_server_1c2_image + port_osm_port_mac_requirements: + mac_count_required: + is_required: false + compute_osm_server_1c2_metadata: + - connectivity_to_server_1c1_BE_1: + get_attribute: + - abstract_BE_1c1 + - BE_1c1_accessIPv4 + connectivity_to_pattern_4: + get_attribute: + - nested2_pattern_4 + - pattern4_attr_1 + connectivity_to_server_1c1_BE_2: + get_attribute: + - abstract_BE_1c1 + - BE_1c1_accessIPv4 + connectivity_to_rd_server_1b: + get_attribute: + - abstract_rd_server_1b + - rd_server_1b_accessIPv4 + compute_osm_server_1c2_availability_zone: + - get_input: availability_zone_0 + service_template_filter: + substitute_service_template: Nested_osm_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_osm_server_1c2_osm_port: + capability: tosca.capabilities.network.Linkable + node: packet_external_network_2 + relationship: tosca.relationships.network.LinksTo + packet_internal_network_2: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_name + packet_external_network_2: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_name + abstract_BE_1c1: + type: org.openecomp.resource.abstract.nodes.BE_1c1 + directives: + - substitutable + properties: + vm_flavor_name: + get_input: BE_1c1_flavor + port_BE_port_mac_requirements: + mac_count_required: + is_required: false + port_BE_port_fixed_ips: + - - ip_address: + get_input: + - BE_osm_ips + - 0 + - - ip_address: + get_input: + - BE_osm_ips + - 0 + compute_BE_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_BE_port_network: + - packet_internal_network_2 + - packet_internal_network_2 + port_BE_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: BE_1c1_image + compute_BE_1c1_name: + - get_input: + - BE_1c1_names + - 1 + - get_input: + - BE_1c1_names + - 0 + port_BE_port_replacement_policy: + - AUTO + - AUTO + port_BE_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_BE_1c1ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_BE_1c1_BE_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network_2 + relationship: tosca.relationships.network.LinksTo + test_nested_all_patterns: + type: org.openecomp.resource.abstract.nodes.heat.nested1 + directives: + - substitutable + properties: + p1: + get_attribute: + - test_nested_pattern_4 + - pattern4_attr_1 + service_template_filter: + substitute_service_template: nested1ServiceTemplate.yaml + p2: + get_attribute: + - test_nested_no_compute + - no_compute_attr_1 + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - dependsOn_network + - test_nested_pattern_4 + - test_nested_no_compute + - test_nested_all_patterns + nested2_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested2.yml + description: nested1 + members: + - nested2_pattern_4 + - packet_internal_network_2 + - packet_external_network_2 + - abstract_rd_server_1b + - abstract_rd_server_1b_1 + - abstract_osm_server_1c2_0 + - abstract_osm_server_1c2_1 + - abstract_BE_1c1 + outputs: + all_pattern_attr_1: + description: all_pattern_attr_1 + value: + get_attribute: + - abstract_osm_server_1c2_1 + - osm_server_1c2_accessIPv4 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml index 73e9ca5745..b5533b8d3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml @@ -77,34 +77,43 @@ topology_template: required: true entry_schema: type: string + port_BE_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean node_templates: BE_1c1_BE_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_BE_port_exCP_naming replacement_policy: get_input: - port_BE_port_replacement_policy - index_value + mac_requirements: + get_input: port_BE_port_mac_requirements + order: + get_input: port_BE_port_order + exCP_naming: + get_input: port_BE_port_exCP_naming vlan_requirements: get_input: port_BE_port_vlan_requirements + subinterface_indicator: + get_input: + - port_BE_port_subinterface_indicator + - index_value ip_requirements: get_input: port_BE_port_ip_requirements network_role_tag: get_input: port_BE_port_network_role_tag - mac_requirements: - get_input: port_BE_port_mac_requirements - order: - get_input: port_BE_port_order network_role: get_input: port_BE_port_network_role - subnetpoolid: - get_input: port_BE_port_subnetpoolid fixed_ips: get_input: - port_BE_port_fixed_ips - index_value + subnetpoolid: + get_input: port_BE_port_subnetpoolid network: get_input: - port_BE_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml index 1ff72bd1dc..2b317c5b0f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml index d4e29804b6..dfc91c7f43 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -61,6 +61,11 @@ topology_template: required: true entry_schema: type: json + port_oam_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -105,30 +110,34 @@ topology_template: oam_server_1c2_oam_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_oam_port_exCP_naming replacement_policy: get_input: - port_oam_port_replacement_policy - index_value + mac_requirements: + get_input: port_oam_port_mac_requirements + order: + get_input: port_oam_port_order + exCP_naming: + get_input: port_oam_port_exCP_naming vlan_requirements: get_input: port_oam_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_port_ip_requirements network_role_tag: get_input: port_oam_port_network_role_tag - mac_requirements: - get_input: port_oam_port_mac_requirements - order: - get_input: port_oam_port_order network_role: get_input: port_oam_port_network_role - subnetpoolid: - get_input: port_oam_port_subnetpoolid fixed_ips: get_input: - port_oam_port_fixed_ips - index_value + subnetpoolid: + get_input: port_oam_port_subnetpoolid network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml index 03a4b2139e..f77c265371 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_osm_port_subnetpoolid: type: string required: true + port_osm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -86,30 +91,34 @@ topology_template: osm_server_1c2_osm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_osm_port_exCP_naming replacement_policy: get_input: - port_osm_port_replacement_policy - index_value + mac_requirements: + get_input: port_osm_port_mac_requirements + order: + get_input: port_osm_port_order + exCP_naming: + get_input: port_osm_port_exCP_naming vlan_requirements: get_input: port_osm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_osm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_osm_port_ip_requirements network_role_tag: get_input: port_osm_port_network_role_tag - mac_requirements: - get_input: port_osm_port_mac_requirements - order: - get_input: port_osm_port_order network_role: get_input: port_osm_port_network_role - subnetpoolid: - get_input: port_osm_port_subnetpoolid fixed_ips: get_input: - port_osm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_osm_port_subnetpoolid network: get_input: - port_osm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index 113a7b3042..0d0073bd0c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index ab151d515e..35a5263155 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml index 0cd9331bfd..33fc9dafc2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: string + port_rd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true @@ -81,30 +86,34 @@ topology_template: rd_server_1b_rd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_rd_server_1b_port_exCP_naming replacement_policy: get_input: - port_rd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_rd_server_1b_port_mac_requirements + order: + get_input: port_rd_server_1b_port_order + exCP_naming: + get_input: port_rd_server_1b_port_exCP_naming vlan_requirements: get_input: port_rd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_rd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_rd_server_1b_port_ip_requirements network_role_tag: get_input: port_rd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_rd_server_1b_port_mac_requirements - order: - get_input: port_rd_server_1b_port_order network_role: get_input: port_rd_server_1b_port_network_role - subnetpoolid: - get_input: port_rd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_rd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_rd_server_1b_port_subnetpoolid network: get_input: - port_rd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml index 560eb84fe9..286bbfa5df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -81,30 +86,34 @@ topology_template: rd_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml index a78063d0b8..1b2c3f0b62 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml @@ -1,1744 +1,1755 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- p1:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- p2:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- cmaui_1c1_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- ps_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: PD server names
- entry_schema:
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- oam_server_1c2_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- cmaui_1c1_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- ps_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- cmaui_1c1_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- packet_internal_network_1_name:
- hidden: false
- immutable: false
- type: string
- packet_external_network_1_name:
- hidden: false
- immutable: false
- type: string
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- ps_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PS server
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- ps_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: Ps Image server
- net:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: PD Image server
- oam_server_1c2_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- oam_server_1c2_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server_1b_1:
- type: org.openecomp.resource.abstract.nodes.pd_server_1b_1
- directives:
- - substitutable
- properties:
- compute_pd_server_1b_name:
- - get_input:
- - pd_server_1b_names
- - 0
- vm_flavor_name:
- get_input: pd_server_1b_flavor
- vm_image_name:
- get_input: pd_server_1b_image
- port_pd_server_1b_port_replacement_policy:
- - AUTO
- port_pd_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_1b_ips
- - 0
- port_pd_server_1b_port_network:
- - get_input: net
- compute_pd_server_1b_availability_zone:
- - get_input: availability_zone_0
- port_pd_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_cmaui_1c1:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - packet_external_network_1
- - packet_external_network_1
- compute_cmaui_1c1_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: cmaui_1c1_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_name:
- - get_input:
- - cmaui_1c1_names
- - 1
- - get_input:
- - cmaui_1c1_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_cmaui_1c1_cmaui_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_external_network_1
- relationship: tosca.relationships.network.LinksTo
- nested1_pattern_4:
- type: org.openecomp.resource.abstract.nodes.heat.pd_server
- directives:
- - substitutable
- properties:
- service_template_filter:
- substitute_service_template: nested-pattern-4ServiceTemplate.yaml
- p2:
- get_input: p2
- port_pd_server_port_2_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_2_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_port_1_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd_server_port_1_mac_requirements:
- mac_count_required:
- is_required: false
- abstract_pd_server_1b:
- type: org.openecomp.resource.abstract.nodes.pd_server_1b
- directives:
- - substitutable
- properties:
- compute_pd_server_1b_name:
- - get_input:
- - pd_server_1b_names
- - 1
- port_ps_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_1b_ips
- - 0
- vm_flavor_name:
- get_input: pd_server_1b_flavor
- port_ps_server_1b_port_network:
- - get_input: net
- port_ps_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_server_1b_image
- port_ps_server_1b_port_replacement_policy:
- - AUTO
- compute_pd_server_1b_availability_zone:
- - get_input: availability_zone_0
- service_template_filter:
- substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- packet_internal_network_1:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_internal_network_1_name
- abstract_oam_server_1c2_1:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 1
- port_oam_port_network:
- - packet_external_network_1
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- compute_oam_server_1c2_metadata:
- - connectivity_to_pattern_4:
- get_attribute:
- - nested1_pattern_4
- - pattern4_attr_1
- connectivity_to_server_1c1_cmaui_1:
- get_attribute:
- - abstract_cmaui_1c1
- - cmaui_1c1_accessIPv4
- connectivity_to_pd_server_1b:
- get_attribute:
- - abstract_pd_server_1b_1
- - pd_server_1b_accessIPv4
- connectivity_to_server_1c1_cmaui_2:
- get_attribute:
- - abstract_cmaui_1c1
- - cmaui_1c1_accessIPv4
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_external_network_1
- relationship: tosca.relationships.network.LinksTo
- abstract_oam_server_1c2_0:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 0
- port_oam_port_network:
- - packet_internal_network_1
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network_1
- relationship: tosca.relationships.network.LinksTo
- packet_external_network_1:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_external_network_1_name
- groups:
- nested1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested1.yml
- description: nested1
- members:
- - nested1_pattern_4
- - packet_internal_network_1
- - packet_external_network_1
- - abstract_oam_server_1c2_0
- - abstract_oam_server_1c2_1
- - abstract_pd_server_1b
- - abstract_pd_server_1b_1
- - abstract_cmaui_1c1
- outputs:
- all_pattern_attr_1:
- description: all_pattern_attr_1
- value:
- get_attribute:
- - abstract_oam_server_1c2_1
- - oam_server_1c2_accessIPv4
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested1
- capabilities:
- memory_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - memory_server_pd
- binding_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - binding_pd_server_1b_ps_server_1b_port
- disk.capacity_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.capacity_pd_server_1b
- disk.capacity_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.capacity_pd_server_1b
- disk.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- disk.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- disk.device.read.requests.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.read.requests.rate_server_pd
- feature_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - feature_pd_server_1b_pd_server_1b_port
- network.outgoing.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- network.outgoing.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- disk.device.iops_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.iops_pd_server_1b
- disk.read.requests_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.read.requests_server_pd
- disk.device.write.bytes_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.write.bytes_server_pd
- cpu.delta_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - cpu.delta_server_pd
- disk.device.iops_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.iops_pd_server_1b
- scalable_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - scalable_oam_server_1c2
- scalable_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - scalable_oam_server_1c2
- network.outgoing.packets.rate_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port
- disk.device.read.requests_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.read.requests_server_pd
- feature_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - feature_pd_server_port_1
- network.outpoing.packets_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.outpoing.packets_pd_server_port_1
- disk.device.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.capacity_oam_server_1c2
- disk.capacity_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.capacity_server_pd
- disk.device.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.capacity_oam_server_1c2
- network.outpoing.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outpoing.packets_oam_server_1c2_oam_port
- network.outpoing.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outpoing.packets_oam_server_1c2_oam_port
- binding_cmaui_port_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- binding_cmaui_port_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- end_point_packet_internal_network_1:
- - packet_internal_network_1
- - end_point
- memory_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory_oam_server_1c2
- memory_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory_oam_server_1c2
- disk.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes_oam_server_1c2
- disk.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes_oam_server_1c2
- network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.bytes.rate_pd_server_port_2
- network.incoming.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- network.incoming.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- network.incoming.packets_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.packets_pd_server_port_2
- os_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - os_oam_server_1c2
- disk.device.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- disk.device.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- network.outgoing.packets.rate_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
- memory.resident_server_1b_pd_2:
- - abstract_pd_server_1b
- - memory.resident_pd_server_1b
- disk.allocation_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.allocation_server_pd
- os_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - os_oam_server_1c2
- memory.resident_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - memory.resident_pd_server_1b
- disk.device.write.bytes.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.write.bytes.rate_server_pd
- feature_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2
- network.incoming.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- network.incoming.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- network.outgoing.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes_oam_server_1c2_oam_port
- feature_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2
- network.outgoing.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes_oam_server_1c2_oam_port
- disk.device.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- host_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - host_server_pd
- attachment_oam_port_2:
- - abstract_oam_server_1c2_1
- - attachment_oam_server_1c2_oam_port
- disk.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.capacity_oam_server_1c2
- disk.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.capacity_oam_server_1c2
- endpoint_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - endpoint_server_pd
- attachment_oam_port_1:
- - abstract_oam_server_1c2_0
- - attachment_oam_server_1c2_oam_port
- disk.device.read.bytes.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.read.bytes.rate_server_pd
- disk.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes.rate_oam_server_1c2
- disk.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes.rate_oam_server_1c2
- disk.device.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- disk.device.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- disk.device.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- disk.device.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.latency_oam_server_1c2
- disk.device.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.latency_oam_server_1c2
- disk.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- disk.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- cpu_util_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- disk.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.allocation_oam_server_1c2
- disk.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.allocation_oam_server_1c2
- cpu_util_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- binding_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - binding_pd_server_1b_pd_server_1b_port
- disk.device.latency_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.latency_server_pd
- disk.write.requests_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.write.requests_pd_server_1b
- disk.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes_oam_server_1c2
- network.outpoing.packets_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.outpoing.packets_pd_server_port_2
- disk.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes_oam_server_1c2
- disk.write.requests_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.write.requests_pd_server_1b
- binding_oam_port_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2_oam_port
- binding_oam_port_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2_oam_port
- disk.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- disk.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- host_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- host_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- vcpus_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - vcpus_pd_server_1b
- vcpus_server_1b_pd_2:
- - abstract_pd_server_1b
- - vcpus_pd_server_1b
- disk.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.latency_oam_server_1c2
- network.incoming.bytes.rate_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.bytes.rate_pd_server_port_1
- disk.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.latency_oam_server_1c2
- disk.device.usage_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.usage_server_pd
- disk.root.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.root.size_oam_server_1c2
- disk.root.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.root.size_oam_server_1c2
- disk.device.write.requests_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.write.requests_pd_server_1b
- cpu_util_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - cpu_util_server_pd
- disk.device.write.requests_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.write.requests_pd_server_1b
- network.incoming.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- network.outgoing.bytes.rate_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.bytes.rate_pd_server_port_1
- network.incoming.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- memory.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- memory.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- end_point_packet_external_network_1:
- - packet_external_network_1
- - end_point
- binding_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- binding_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- disk.device.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.iops_oam_server_1c2
- disk.device.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.iops_oam_server_1c2
- network.incoming.bytes_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.bytes_pd_server_port_2
- forwarder_oam_port_1:
- - abstract_oam_server_1c2_0
- - forwarder_oam_server_1c2_oam_port
- forwarder_oam_port_2:
- - abstract_oam_server_1c2_1
- - forwarder_oam_server_1c2_oam_port
- binding_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2
- binding_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.read.bytes.rate_pd_server_1b
- disk.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests_oam_server_1c2
- disk.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.read.bytes.rate_pd_server_1b
- network.incoming.bytes_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.incoming.bytes_pd_server_1b_ps_server_1b_port
- network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.packets.rate_pd_server_port_2
- disk.usage_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.usage_pd_server_1b
- disk.write.bytes.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.write.bytes.rate_pd_server_1b
- disk.write.bytes.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.write.bytes.rate_pd_server_1b
- disk.usage_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.usage_pd_server_1b
- network.incoming.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- disk.device.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests_oam_server_1c2
- disk.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- disk.device.write.bytes.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.write.bytes.rate_pd_server_1b
- disk.device.write.bytes.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.write.bytes.rate_pd_server_1b
- network.incoming.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- feature_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - feature_pd_server_1b
- disk.device.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- disk.device.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- feature_server_1b_pd_2:
- - abstract_pd_server_1b
- - feature_pd_server_1b
- disk.device.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests_oam_server_1c2
- disk.device.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests_oam_server_1c2
- disk.device.write.bytes_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.write.bytes_pd_server_1b
- disk.device.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests_oam_server_1c2
- disk.device.write.bytes_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.write.bytes_pd_server_1b
- disk.device.read.bytes_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.read.bytes_server_pd
- network.incoming.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- network.incoming.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- disk.iops_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.iops_pd_server_1b
- disk.iops_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.iops_pd_server_1b
- disk.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- disk.device.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.allocation_oam_server_1c2
- disk.device.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.allocation_oam_server_1c2
- disk.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- disk.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- link_packet_external_network_1:
- - packet_external_network_1
- - link
- network.outgoing.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- network.incoming.bytes_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.bytes_pd_server_port_1
- cpu_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- network.outgoing.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- cpu_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- network.outpoing.packets_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.outpoing.packets_pd_server_1b_ps_server_1b_port
- cpu_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_oam_server_1c2
- cpu_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_oam_server_1c2
- disk.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests.rate_oam_server_1c2
- disk.device.read.bytes_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.read.bytes_pd_server_1b
- attachment_packet_external_network_1:
- - packet_external_network_1
- - attachment
- disk.device.read.bytes_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.read.bytes_pd_server_1b
- feature_packet_internal_network_1:
- - packet_internal_network_1
- - feature
- disk.iops_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.iops_server_pd
- disk.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests.rate_oam_server_1c2
- disk.read.bytes_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.read.bytes_pd_server_1b
- disk.device.write.requests_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.write.requests_server_pd
- disk.read.bytes_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.read.bytes_pd_server_1b
- endpoint_server_1b_pd_2:
- - abstract_pd_server_1b
- - endpoint_pd_server_1b
- endpoint_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - endpoint_pd_server_1b
- network.incoming.bytes_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.incoming.bytes_pd_server_1b_pd_server_1b_port
- instance_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - instance_server_pd
- disk.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- memory_server_1b_pd_2:
- - abstract_pd_server_1b
- - memory_pd_server_1b
- disk.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- memory_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - memory_pd_server_1b
- network.outgoing.packets.rate_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.packets.rate_pd_server_port_1
- feature_packet_external_network_1:
- - packet_external_network_1
- - feature
- disk.device.latency_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.latency_pd_server_1b
- disk.device.latency_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.latency_pd_server_1b
- disk.read.bytes_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.read.bytes_server_pd
- disk.device.iops_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.iops_server_pd
- network.incoming.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- network.incoming.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- disk.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.device.read.requests_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.read.requests_pd_server_1b
- disk.device.read.requests_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.read.requests_pd_server_1b
- forwarder_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - forwarder_pd_server_port_2
- disk.device.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes_oam_server_1c2
- disk.device.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes_oam_server_1c2
- disk.write.bytes_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.write.bytes_server_pd
- feature_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - feature_pd_server_port_2
- disk.device.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.device.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.iops_oam_server_1c2
- forwarder_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - forwarder_pd_server_1b_pd_server_1b_port
- disk.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.usage_oam_server_1c2
- feature_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- disk.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.usage_oam_server_1c2
- feature_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- network.outpoing.packets_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.outpoing.packets_pd_server_1b_pd_server_1b_port
- network.outgoing.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- disk.device.capacity_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.capacity_server_pd
- disk.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.iops_oam_server_1c2
- network.outgoing.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- network.outgoing.bytes_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.bytes_pd_server_port_1
- binding_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - binding_server_pd
- cpu_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - cpu_pd_server_1b
- feature_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - feature_server_pd
- disk.device.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests.rate_oam_server_1c2
- disk.device.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests.rate_oam_server_1c2
- disk.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes.rate_oam_server_1c2
- memory.usage_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - memory.usage_server_pd
- scalable_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - scalable_server_pd
- disk.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes.rate_oam_server_1c2
- cpu_server_1b_pd_2:
- - abstract_pd_server_1b
- - cpu_pd_server_1b
- disk.usage_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.usage_server_pd
- network.outgoing.bytes_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.bytes_pd_server_port_2
- vcpus_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - vcpus_server_pd
- link_packet_internal_network_1:
- - packet_internal_network_1
- - link
- disk.write.bytes_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.write.bytes_pd_server_1b
- disk.write.bytes_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.write.bytes_pd_server_1b
- disk.device.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.usage_oam_server_1c2
- network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.packets.rate_pd_server_port_2
- disk.device.write.requests.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.write.requests.rate_pd_server_1b
- disk.device.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.usage_oam_server_1c2
- forwarder_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - forwarder_pd_server_port_1
- disk.latency_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.latency_server_pd
- disk.device.write.requests.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.write.requests.rate_pd_server_1b
- attachment_packet_internal_network_1:
- - packet_internal_network_1
- - attachment
- disk.write.requests.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.write.requests.rate_server_pd
- os_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - os_server_pd
- cpu_util_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_util_oam_server_1c2
- cpu_util_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_util_oam_server_1c2
- network.incoming.packets_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.incoming.packets_pd_server_1b_ps_server_1b_port
- network.outgoing.bytes.rate_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port
- network.outgoing.bytes_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
- attachment_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - attachment_pd_server_port_1
- memory.resident_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.resident_oam_server_1c2
- memory.resident_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.resident_oam_server_1c2
- disk.device.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- disk.device.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- disk.root.size_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.root.size_server_pd
- vcpus_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- feature_cmaui_port_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- feature_cmaui_port_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- instance_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- instance_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- network.outgoing.bytes.rate_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
- attachment_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - attachment_pd_server_port_2
- disk.device.read.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests.rate_oam_server_1c2
- disk.device.read.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests.rate_oam_server_1c2
- os_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - os_pd_server_1b
- os_server_1b_pd_2:
- - abstract_pd_server_1b
- - os_pd_server_1b
- disk.root.size_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.root.size_pd_server_1b
- endpoint_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- network.incoming.packets.rate_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port
- host_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - host_pd_server_1b
- disk.root.size_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.root.size_pd_server_1b
- endpoint_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- host_server_1b_pd_2:
- - abstract_pd_server_1b
- - host_pd_server_1b
- vcpus_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- forwarder_cmaui_port_2:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- forwarder_cmaui_port_1:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- disk.allocation_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.allocation_pd_server_1b
- disk.allocation_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.allocation_pd_server_1b
- attachment_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - attachment_pd_server_1b_ps_server_1b_port
- disk.device.read.requests.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.read.requests.rate_pd_server_1b
- disk.device.read.requests.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.read.requests.rate_pd_server_1b
- disk.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- disk.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- memory.resident_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - memory.resident_server_pd
- network.outgoing.bytes.rate_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - network.outgoing.bytes.rate_pd_server_port_2
- network.outgoing.bytes_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.outgoing.bytes_pd_server_1b_ps_server_1b_port
- disk.device.allocation_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.allocation_server_pd
- network.outpoing.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- network.outpoing.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- disk.read.bytes.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.read.bytes.rate_pd_server_1b
- disk.read.bytes.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.read.bytes.rate_pd_server_1b
- memory.usage_server_1b_pd_2:
- - abstract_pd_server_1b
- - memory.usage_pd_server_1b
- memory.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.usage_oam_server_1c2
- memory.usage_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - memory.usage_pd_server_1b
- memory.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.usage_oam_server_1c2
- disk.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.requests_oam_server_1c2
- disk.latency_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.latency_pd_server_1b
- disk.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.requests_oam_server_1c2
- disk.latency_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.latency_pd_server_1b
- memory.resident_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- memory.resident_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- os_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- os_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- disk.ephemeral.size_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.ephemeral.size_server_pd
- instance_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - instance_oam_server_1c2
- instance_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - instance_oam_server_1c2
- memory_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- network.incoming.bytes.rate_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.device.write.requests.rate_server_pd
- disk.write.requests.rate_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.write.requests.rate_pd_server_1b
- disk.write.requests.rate_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.write.requests.rate_pd_server_1b
- memory_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- disk.read.bytes.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.read.bytes.rate_server_pd
- vcpus_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - vcpus_oam_server_1c2
- vcpus_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - vcpus_oam_server_1c2
- disk.device.allocation_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.allocation_pd_server_1b
- disk.device.allocation_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.allocation_pd_server_1b
- disk.ephemeral.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.ephemeral.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.root.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.root.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.read.requests_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.read.requests_pd_server_1b
- disk.device.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.read.requests_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.read.requests_pd_server_1b
- cpu_util_server_1b_pd_2:
- - abstract_pd_server_1b
- - cpu_util_pd_server_1b
- cpu_util_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - cpu_util_pd_server_1b
- disk.write.requests_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.write.requests_server_pd
- forwarder_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - forwarder_pd_server_1b_ps_server_1b_port
- disk.device.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- disk.device.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.device.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- host_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - host_oam_server_1c2
- host_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - host_oam_server_1c2
- cpu_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - cpu_server_pd
- disk.device.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- disk.device.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- binding_server_1b_pd_2:
- - abstract_pd_server_1b
- - binding_pd_server_1b
- binding_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - binding_pd_server_1b
- binding_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - binding_pd_server_port_2
- disk.device.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- disk.device.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- attachment_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - attachment_pd_server_1b_pd_server_1b_port
- cpu.delta_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu.delta_oam_server_1c2
- disk.ephemeral.size_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.ephemeral.size_pd_server_1b
- disk.ephemeral.size_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.ephemeral.size_pd_server_1b
- disk.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- disk.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- network.incoming.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes_oam_server_1c2_oam_port
- network.incoming.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes_oam_server_1c2_oam_port
- disk.write.bytes.rate_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - disk.write.bytes.rate_server_pd
- attachment_cmaui_port_2:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- network.outgoing.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- instance_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - instance_pd_server_1b
- disk.device.capacity_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.capacity_pd_server_1b
- network.outgoing.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- instance_server_1b_pd_2:
- - abstract_pd_server_1b
- - instance_pd_server_1b
- disk.device.capacity_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.capacity_pd_server_1b
- disk.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- network.outgoing.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- network.outgoing.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- attachment_cmaui_port_1:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- disk.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- disk.ephemeral.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.ephemeral.size_oam_server_1c2
- disk.ephemeral.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.ephemeral.size_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- network.incoming.packets.rate_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
- disk.device.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- cpu.delta_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu.delta_oam_server_1c2
- disk.device.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes.rate_oam_server_1c2
- disk.device.usage_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - disk.device.usage_pd_server_1b
- disk.device.usage_server_1b_pd_2:
- - abstract_pd_server_1b
- - disk.device.usage_pd_server_1b
- network.incoming.packets.rate_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.packets.rate_pd_server_port_1
- disk.device.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes.rate_oam_server_1c2
- disk.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- disk.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- feature_oam_port_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2_oam_port
- feature_oam_port_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2_oam_port
- feature_nested1_pattern_4:
- - nested1_pattern_4
- - feature
- network.incoming.packets_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - network.incoming.packets_pd_server_port_1
- disk.device.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- scalable_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- disk.device.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- scalable_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- cpu.delta_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- cpu.delta_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- scalable_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - scalable_pd_server_1b
- scalable_server_1b_pd_2:
- - abstract_pd_server_1b
- - scalable_pd_server_1b
- cpu.delta_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - cpu.delta_pd_server_1b
- cpu.delta_server_1b_pd_2:
- - abstract_pd_server_1b
- - cpu.delta_pd_server_1b
- network.incoming.packets_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.incoming.packets_pd_server_1b_pd_server_1b_port
- binding_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - binding_pd_server_port_1
- network.incoming.bytes.rate_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
- feature_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - feature_pd_server_1b_ps_server_1b_port
- endpoint_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - endpoint_oam_server_1c2
- endpoint_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - endpoint_oam_server_1c2
- requirements:
- dependency_oam_port_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2_oam_port
- dependency_oam_port_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2_oam_port
- dependency_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - dependency_pd_server_port_1
- link_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - link_pd_server_port_2
- dependency_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - dependency_pd_server_1b_pd_server_1b_port
- dependency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2
- dependency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2
- local_storage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - local_storage_oam_server_1c2
- local_storage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - local_storage_oam_server_1c2
- dependency_cmaui_port_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - dependency_server_pd
- dependency_pd_server_port_2_nested1_pattern_4:
- - nested1_pattern_4
- - dependency_pd_server_port_2
- dependency_cmaui_port_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_packet_internal_network_1:
- - packet_internal_network_1
- - dependency
- link_pd_server_port_1_nested1_pattern_4:
- - nested1_pattern_4
- - link_pd_server_port_1
- dependency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- local_storage_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - local_storage_pd_server_1b
- local_storage_server_pd_nested1_pattern_4:
- - nested1_pattern_4
- - local_storage_server_pd
- local_storage_server_1b_pd_2:
- - abstract_pd_server_1b
- - local_storage_pd_server_1b
- dependency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- link_pd_server_1b_port_1:
- - abstract_pd_server_1b_1
- - link_pd_server_1b_pd_server_1b_port
- link_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - link_pd_server_1b_ps_server_1b_port
- dependency_packet_external_network_1:
- - packet_external_network_1
- - dependency
- dependency_ps_server_1b_port_1:
- - abstract_pd_server_1b
- - dependency_pd_server_1b_ps_server_1b_port
- local_storage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- local_storage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- dependency_server_1b_pd_1:
- - abstract_pd_server_1b_1
- - dependency_pd_server_1b
- dependency_nested1_pattern_4:
- - nested1_pattern_4
- - dependency
- dependency_server_1b_pd_2:
- - abstract_pd_server_1b
- - dependency_pd_server_1b
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + immutable: false + type: string + description: UID of OAM network + cmaui_1c1_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + ps_server_1b_ips: + hidden: false + immutable: false + type: string + pd_server_1b_names: + hidden: false + immutable: false + type: list + description: PD server names + entry_schema: + type: string + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + oam_server_1c2_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + cmaui_1c1_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + ps_server_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + cmaui_1c1_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + pd_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + pd_server_1b_ips: + hidden: false + immutable: false + type: string + packet_internal_network_1_name: + hidden: false + immutable: false + type: string + packet_external_network_1_name: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + ps_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PS server + cmaui_oam_ips: + hidden: false + immutable: false + type: string + ps_server_1b_image: + hidden: false + immutable: false + type: string + description: Ps Image server + net: + hidden: false + immutable: false + type: string + pd_server_1b_image: + hidden: false + immutable: false + type: string + description: PD Image server + oam_server_1c2_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + oam_server_1c2_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + node_templates: + abstract_pd_server_1b_1: + type: org.openecomp.resource.abstract.nodes.pd_server_1b_1 + directives: + - substitutable + properties: + compute_pd_server_1b_name: + - get_input: + - pd_server_1b_names + - 0 + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_1b_ips + - 0 + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_cmaui_1c1: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1 + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - packet_external_network_1 + - packet_external_network_1 + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_name: + - get_input: + - cmaui_1c1_names + - 1 + - get_input: + - cmaui_1c1_names + - 0 + port_cmaui_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_cmaui_1c1_cmaui_port: + capability: tosca.capabilities.network.Linkable + node: packet_external_network_1 + relationship: tosca.relationships.network.LinksTo + nested1_pattern_4: + type: org.openecomp.resource.abstract.nodes.heat.pd_server + directives: + - substitutable + properties: + service_template_filter: + substitute_service_template: nested-pattern-4ServiceTemplate.yaml + p2: + get_input: p2 + port_pd_server_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd_server_port_1_mac_requirements: + mac_count_required: + is_required: false + abstract_pd_server_1b: + type: org.openecomp.resource.abstract.nodes.pd_server_1b + directives: + - substitutable + properties: + compute_pd_server_1b_name: + - get_input: + - pd_server_1b_names + - 1 + port_ps_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true + port_ps_server_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + vm_flavor_name: + get_input: pd_server_1b_flavor + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: pd_server_1b_image + port_ps_server_1b_port_replacement_policy: + - AUTO + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + service_template_filter: + substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + packet_internal_network_1: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_1_name + abstract_oam_server_1c2_1: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 1 + port_oam_port_network: + - packet_external_network_1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + compute_oam_server_1c2_metadata: + - connectivity_to_pattern_4: + get_attribute: + - nested1_pattern_4 + - pattern4_attr_1 + connectivity_to_server_1c1_cmaui_1: + get_attribute: + - abstract_cmaui_1c1 + - cmaui_1c1_accessIPv4 + connectivity_to_pd_server_1b: + get_attribute: + - abstract_pd_server_1b_1 + - pd_server_1b_accessIPv4 + connectivity_to_server_1c1_cmaui_2: + get_attribute: + - abstract_cmaui_1c1 + - cmaui_1c1_accessIPv4 + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_external_network_1 + relationship: tosca.relationships.network.LinksTo + abstract_oam_server_1c2_0: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 0 + port_oam_port_network: + - packet_internal_network_1 + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network_1 + relationship: tosca.relationships.network.LinksTo + packet_external_network_1: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_1_name + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: nested1 + members: + - nested1_pattern_4 + - packet_internal_network_1 + - packet_external_network_1 + - abstract_oam_server_1c2_0 + - abstract_oam_server_1c2_1 + - abstract_pd_server_1b + - abstract_pd_server_1b_1 + - abstract_cmaui_1c1 + outputs: + all_pattern_attr_1: + description: all_pattern_attr_1 + value: + get_attribute: + - abstract_oam_server_1c2_1 + - oam_server_1c2_accessIPv4 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + capabilities: + memory_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - memory_server_pd + binding_ps_server_1b_port_1: + - abstract_pd_server_1b + - binding_pd_server_1b_ps_server_1b_port + disk.capacity_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.capacity_pd_server_1b + disk.capacity_server_1b_pd_2: + - abstract_pd_server_1b + - disk.capacity_pd_server_1b + disk.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + disk.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + disk.device.read.requests.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.read.requests.rate_server_pd + feature_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - feature_pd_server_1b_pd_server_1b_port + network.outgoing.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + network.outgoing.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + disk.device.iops_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.iops_pd_server_1b + disk.read.requests_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.read.requests_server_pd + disk.device.write.bytes_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.write.bytes_server_pd + cpu.delta_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - cpu.delta_server_pd + disk.device.iops_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.iops_pd_server_1b + scalable_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - scalable_oam_server_1c2 + scalable_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - scalable_oam_server_1c2 + network.outgoing.packets.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_ps_server_1b_port + disk.device.read.requests_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.read.requests_server_pd + feature_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_port_1 + network.outpoing.packets_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_port_1 + disk.device.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.capacity_oam_server_1c2 + disk.capacity_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.capacity_server_pd + disk.device.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.capacity_oam_server_1c2 + network.outpoing.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_port + network.outpoing.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_port + binding_cmaui_port_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + binding_cmaui_port_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + end_point_packet_internal_network_1: + - packet_internal_network_1 + - end_point + memory_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory_oam_server_1c2 + memory_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory_oam_server_1c2 + disk.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes_oam_server_1c2 + disk.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes_oam_server_1c2 + network.incoming.bytes.rate_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_port_2 + network.incoming.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + network.incoming.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + network.incoming.packets_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_port_2 + os_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - os_oam_server_1c2 + disk.device.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + disk.device.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + network.outgoing.packets.rate_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + memory.resident_server_1b_pd_2: + - abstract_pd_server_1b + - memory.resident_pd_server_1b + disk.allocation_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.allocation_server_pd + os_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - os_oam_server_1c2 + memory.resident_server_1b_pd_1: + - abstract_pd_server_1b_1 + - memory.resident_pd_server_1b + disk.device.write.bytes.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.write.bytes.rate_server_pd + feature_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2 + network.incoming.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + network.incoming.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + network.outgoing.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes_oam_server_1c2_oam_port + feature_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2 + network.outgoing.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_port + disk.device.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + host_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - host_server_pd + attachment_oam_port_2: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_port + disk.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.capacity_oam_server_1c2 + disk.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.capacity_oam_server_1c2 + endpoint_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - endpoint_server_pd + attachment_oam_port_1: + - abstract_oam_server_1c2_0 + - attachment_oam_server_1c2_oam_port + disk.device.read.bytes.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.read.bytes.rate_server_pd + disk.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes.rate_oam_server_1c2 + disk.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes.rate_oam_server_1c2 + disk.device.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + disk.device.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + disk.device.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + disk.device.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.latency_oam_server_1c2 + disk.device.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.latency_oam_server_1c2 + disk.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + disk.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + cpu_util_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + disk.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.allocation_oam_server_1c2 + disk.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.allocation_oam_server_1c2 + cpu_util_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + binding_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - binding_pd_server_1b_pd_server_1b_port + disk.device.latency_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.latency_server_pd + disk.write.requests_server_1b_pd_2: + - abstract_pd_server_1b + - disk.write.requests_pd_server_1b + disk.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes_oam_server_1c2 + network.outpoing.packets_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.outpoing.packets_pd_server_port_2 + disk.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes_oam_server_1c2 + disk.write.requests_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.write.requests_pd_server_1b + binding_oam_port_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_port + binding_oam_port_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_port + disk.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + disk.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + host_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + host_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + vcpus_server_1b_pd_1: + - abstract_pd_server_1b_1 + - vcpus_pd_server_1b + vcpus_server_1b_pd_2: + - abstract_pd_server_1b + - vcpus_pd_server_1b + disk.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.latency_oam_server_1c2 + network.incoming.bytes.rate_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes.rate_pd_server_port_1 + disk.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.latency_oam_server_1c2 + disk.device.usage_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.usage_server_pd + disk.root.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.root.size_oam_server_1c2 + disk.root.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.root.size_oam_server_1c2 + disk.device.write.requests_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.write.requests_pd_server_1b + cpu_util_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - cpu_util_server_pd + disk.device.write.requests_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.write.requests_pd_server_1b + network.incoming.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + network.outgoing.bytes.rate_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_port_1 + network.incoming.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + memory.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + memory.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + end_point_packet_external_network_1: + - packet_external_network_1 + - end_point + binding_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + binding_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + disk.device.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.iops_oam_server_1c2 + disk.device.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.iops_oam_server_1c2 + network.incoming.bytes_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_port_2 + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port + binding_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2 + binding_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.read.bytes.rate_pd_server_1b + disk.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests_oam_server_1c2 + disk.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.read.bytes.rate_pd_server_1b + network.incoming.bytes_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_ps_server_1b_port + network.outgoing.packets.rate_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_port_2 + disk.usage_server_1b_pd_2: + - abstract_pd_server_1b + - disk.usage_pd_server_1b + disk.write.bytes.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.write.bytes.rate_pd_server_1b + disk.write.bytes.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.write.bytes.rate_pd_server_1b + disk.usage_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.usage_pd_server_1b + network.incoming.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + disk.device.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests_oam_server_1c2 + disk.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + disk.device.write.bytes.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.write.bytes.rate_pd_server_1b + disk.device.write.bytes.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.write.bytes.rate_pd_server_1b + network.incoming.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + feature_server_1b_pd_1: + - abstract_pd_server_1b_1 + - feature_pd_server_1b + disk.device.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + disk.device.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + feature_server_1b_pd_2: + - abstract_pd_server_1b + - feature_pd_server_1b + disk.device.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests_oam_server_1c2 + disk.device.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests_oam_server_1c2 + disk.device.write.bytes_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.write.bytes_pd_server_1b + disk.device.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests_oam_server_1c2 + disk.device.write.bytes_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.write.bytes_pd_server_1b + disk.device.read.bytes_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.read.bytes_server_pd + network.incoming.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_port + network.incoming.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_port + disk.iops_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.iops_pd_server_1b + disk.iops_server_1b_pd_2: + - abstract_pd_server_1b + - disk.iops_pd_server_1b + disk.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + disk.device.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.allocation_oam_server_1c2 + disk.device.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.allocation_oam_server_1c2 + disk.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + disk.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + link_packet_external_network_1: + - packet_external_network_1 + - link + network.outgoing.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + network.incoming.bytes_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.bytes_pd_server_port_1 + cpu_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + network.outgoing.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + cpu_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + network.outpoing.packets_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_ps_server_1b_port + cpu_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_oam_server_1c2 + cpu_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_oam_server_1c2 + disk.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests.rate_oam_server_1c2 + disk.device.read.bytes_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.read.bytes_pd_server_1b + attachment_packet_external_network_1: + - packet_external_network_1 + - attachment + disk.device.read.bytes_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.read.bytes_pd_server_1b + feature_packet_internal_network_1: + - packet_internal_network_1 + - feature + disk.iops_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.iops_server_pd + disk.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests.rate_oam_server_1c2 + disk.read.bytes_server_1b_pd_2: + - abstract_pd_server_1b + - disk.read.bytes_pd_server_1b + disk.device.write.requests_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.write.requests_server_pd + disk.read.bytes_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.read.bytes_pd_server_1b + endpoint_server_1b_pd_2: + - abstract_pd_server_1b + - endpoint_pd_server_1b + endpoint_server_1b_pd_1: + - abstract_pd_server_1b_1 + - endpoint_pd_server_1b + network.incoming.bytes_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.incoming.bytes_pd_server_1b_pd_server_1b_port + instance_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - instance_server_pd + disk.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + memory_server_1b_pd_2: + - abstract_pd_server_1b + - memory_pd_server_1b + disk.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + memory_server_1b_pd_1: + - abstract_pd_server_1b_1 + - memory_pd_server_1b + network.outgoing.packets.rate_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.packets.rate_pd_server_port_1 + feature_packet_external_network_1: + - packet_external_network_1 + - feature + disk.device.latency_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.latency_pd_server_1b + disk.device.latency_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.latency_pd_server_1b + disk.read.bytes_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.read.bytes_server_pd + disk.device.iops_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.iops_server_pd + network.incoming.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + network.incoming.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + disk.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.device.read.requests_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.read.requests_pd_server_1b + disk.device.read.requests_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.read.requests_pd_server_1b + forwarder_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - forwarder_pd_server_port_2 + disk.device.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes_oam_server_1c2 + disk.device.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes_oam_server_1c2 + disk.write.bytes_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.write.bytes_server_pd + feature_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - feature_pd_server_port_2 + disk.device.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.device.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.iops_oam_server_1c2 + forwarder_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - forwarder_pd_server_1b_pd_server_1b_port + disk.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.usage_oam_server_1c2 + feature_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + disk.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.usage_oam_server_1c2 + feature_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + network.outpoing.packets_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.outpoing.packets_pd_server_1b_pd_server_1b_port + network.outgoing.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + disk.device.capacity_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.capacity_server_pd + disk.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.iops_oam_server_1c2 + network.outgoing.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + network.outgoing.bytes_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_port_1 + binding_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - binding_server_pd + cpu_server_1b_pd_1: + - abstract_pd_server_1b_1 + - cpu_pd_server_1b + feature_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - feature_server_pd + disk.device.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests.rate_oam_server_1c2 + disk.device.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests.rate_oam_server_1c2 + disk.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes.rate_oam_server_1c2 + memory.usage_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - memory.usage_server_pd + scalable_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - scalable_server_pd + disk.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes.rate_oam_server_1c2 + cpu_server_1b_pd_2: + - abstract_pd_server_1b + - cpu_pd_server_1b + disk.usage_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.usage_server_pd + network.outgoing.bytes_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes_pd_server_port_2 + vcpus_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - vcpus_server_pd + link_packet_internal_network_1: + - packet_internal_network_1 + - link + disk.write.bytes_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.write.bytes_pd_server_1b + disk.write.bytes_server_1b_pd_2: + - abstract_pd_server_1b + - disk.write.bytes_pd_server_1b + disk.device.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.usage_oam_server_1c2 + network.incoming.packets.rate_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_port_2 + disk.device.write.requests.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.write.requests.rate_pd_server_1b + disk.device.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.usage_oam_server_1c2 + forwarder_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - forwarder_pd_server_port_1 + disk.latency_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.latency_server_pd + disk.device.write.requests.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.write.requests.rate_pd_server_1b + attachment_packet_internal_network_1: + - packet_internal_network_1 + - attachment + disk.write.requests.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.write.requests.rate_server_pd + os_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - os_server_pd + cpu_util_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_util_oam_server_1c2 + cpu_util_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_util_oam_server_1c2 + network.incoming.packets_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_ps_server_1b_port + network.outgoing.bytes_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + attachment_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - attachment_pd_server_port_1 + memory.resident_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.resident_oam_server_1c2 + memory.resident_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.resident_oam_server_1c2 + disk.device.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + disk.device.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + disk.root.size_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.root.size_server_pd + vcpus_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + feature_cmaui_port_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + feature_cmaui_port_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + instance_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + instance_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + network.outgoing.bytes.rate_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + attachment_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - attachment_pd_server_port_2 + disk.device.read.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests.rate_oam_server_1c2 + disk.device.read.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests.rate_oam_server_1c2 + os_server_1b_pd_1: + - abstract_pd_server_1b_1 + - os_pd_server_1b + os_server_1b_pd_2: + - abstract_pd_server_1b + - os_pd_server_1b + disk.root.size_server_1b_pd_2: + - abstract_pd_server_1b + - disk.root.size_pd_server_1b + endpoint_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + network.incoming.packets.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_ps_server_1b_port + host_server_1b_pd_1: + - abstract_pd_server_1b_1 + - host_pd_server_1b + disk.root.size_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.root.size_pd_server_1b + endpoint_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + host_server_1b_pd_2: + - abstract_pd_server_1b + - host_pd_server_1b + vcpus_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + disk.allocation_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.allocation_pd_server_1b + disk.allocation_server_1b_pd_2: + - abstract_pd_server_1b + - disk.allocation_pd_server_1b + attachment_ps_server_1b_port_1: + - abstract_pd_server_1b + - attachment_pd_server_1b_ps_server_1b_port + disk.device.read.requests.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.read.requests.rate_pd_server_1b + disk.device.read.requests.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.read.requests.rate_pd_server_1b + disk.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + disk.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + memory.resident_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - memory.resident_server_pd + network.outgoing.bytes.rate_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - network.outgoing.bytes.rate_pd_server_port_2 + network.outgoing.bytes_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.outgoing.bytes_pd_server_1b_ps_server_1b_port + disk.device.allocation_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.allocation_server_pd + network.outpoing.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + network.outpoing.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + disk.read.bytes.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.read.bytes.rate_pd_server_1b + disk.read.bytes.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.read.bytes.rate_pd_server_1b + memory.usage_server_1b_pd_2: + - abstract_pd_server_1b + - memory.usage_pd_server_1b + memory.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.usage_oam_server_1c2 + memory.usage_server_1b_pd_1: + - abstract_pd_server_1b_1 + - memory.usage_pd_server_1b + memory.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.usage_oam_server_1c2 + disk.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.requests_oam_server_1c2 + disk.latency_server_1b_pd_2: + - abstract_pd_server_1b + - disk.latency_pd_server_1b + disk.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.requests_oam_server_1c2 + disk.latency_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.latency_pd_server_1b + memory.resident_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + memory.resident_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + os_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + os_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + disk.ephemeral.size_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.ephemeral.size_server_pd + instance_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - instance_oam_server_1c2 + instance_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - instance_oam_server_1c2 + memory_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + network.incoming.bytes.rate_ps_server_1b_port_1: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.device.write.requests.rate_server_pd + disk.write.requests.rate_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.write.requests.rate_pd_server_1b + disk.write.requests.rate_server_1b_pd_2: + - abstract_pd_server_1b + - disk.write.requests.rate_pd_server_1b + memory_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + disk.read.bytes.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.read.bytes.rate_server_pd + vcpus_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - vcpus_oam_server_1c2 + vcpus_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - vcpus_oam_server_1c2 + disk.device.allocation_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.allocation_pd_server_1b + disk.device.allocation_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.allocation_pd_server_1b + disk.ephemeral.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.ephemeral.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.root.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.root.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.read.requests_server_1b_pd_2: + - abstract_pd_server_1b + - disk.read.requests_pd_server_1b + disk.device.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.read.requests_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.read.requests_pd_server_1b + cpu_util_server_1b_pd_2: + - abstract_pd_server_1b + - cpu_util_pd_server_1b + cpu_util_server_1b_pd_1: + - abstract_pd_server_1b_1 + - cpu_util_pd_server_1b + disk.write.requests_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.write.requests_server_pd + forwarder_ps_server_1b_port_1: + - abstract_pd_server_1b + - forwarder_pd_server_1b_ps_server_1b_port + disk.device.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + disk.device.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.device.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + host_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - host_oam_server_1c2 + host_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - host_oam_server_1c2 + cpu_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - cpu_server_pd + disk.device.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + disk.device.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + binding_server_1b_pd_2: + - abstract_pd_server_1b + - binding_pd_server_1b + binding_server_1b_pd_1: + - abstract_pd_server_1b_1 + - binding_pd_server_1b + binding_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - binding_pd_server_port_2 + disk.device.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + disk.device.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + attachment_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - attachment_pd_server_1b_pd_server_1b_port + cpu.delta_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu.delta_oam_server_1c2 + disk.ephemeral.size_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.ephemeral.size_pd_server_1b + disk.ephemeral.size_server_1b_pd_2: + - abstract_pd_server_1b + - disk.ephemeral.size_pd_server_1b + disk.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + disk.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + network.incoming.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes_oam_server_1c2_oam_port + network.incoming.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_port + disk.write.bytes.rate_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - disk.write.bytes.rate_server_pd + attachment_cmaui_port_2: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + network.outgoing.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + instance_server_1b_pd_1: + - abstract_pd_server_1b_1 + - instance_pd_server_1b + disk.device.capacity_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + instance_server_1b_pd_2: + - abstract_pd_server_1b + - instance_pd_server_1b + disk.device.capacity_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.capacity_pd_server_1b + disk.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + network.outgoing.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + attachment_cmaui_port_1: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + disk.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + disk.ephemeral.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.ephemeral.size_oam_server_1c2 + disk.ephemeral.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.ephemeral.size_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + network.incoming.packets.rate_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + disk.device.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + cpu.delta_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu.delta_oam_server_1c2 + disk.device.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes.rate_oam_server_1c2 + disk.device.usage_server_1b_pd_1: + - abstract_pd_server_1b_1 + - disk.device.usage_pd_server_1b + disk.device.usage_server_1b_pd_2: + - abstract_pd_server_1b + - disk.device.usage_pd_server_1b + network.incoming.packets.rate_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets.rate_pd_server_port_1 + disk.device.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes.rate_oam_server_1c2 + disk.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + disk.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + feature_oam_port_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_port + feature_oam_port_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_port + feature_nested1_pattern_4: + - nested1_pattern_4 + - feature + network.incoming.packets_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - network.incoming.packets_pd_server_port_1 + disk.device.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + scalable_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + disk.device.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + scalable_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + cpu.delta_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + cpu.delta_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + scalable_server_1b_pd_1: + - abstract_pd_server_1b_1 + - scalable_pd_server_1b + scalable_server_1b_pd_2: + - abstract_pd_server_1b + - scalable_pd_server_1b + cpu.delta_server_1b_pd_1: + - abstract_pd_server_1b_1 + - cpu.delta_pd_server_1b + cpu.delta_server_1b_pd_2: + - abstract_pd_server_1b + - cpu.delta_pd_server_1b + network.incoming.packets_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.incoming.packets_pd_server_1b_pd_server_1b_port + binding_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - binding_pd_server_port_1 + network.incoming.bytes.rate_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + feature_ps_server_1b_port_1: + - abstract_pd_server_1b + - feature_pd_server_1b_ps_server_1b_port + endpoint_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - endpoint_oam_server_1c2 + endpoint_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - endpoint_oam_server_1c2 + requirements: + dependency_oam_port_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_port + dependency_oam_port_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_port + dependency_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - dependency_pd_server_port_1 + link_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - link_pd_server_port_2 + dependency_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - dependency_pd_server_1b_pd_server_1b_port + dependency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2 + dependency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2 + local_storage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - local_storage_oam_server_1c2 + local_storage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - local_storage_oam_server_1c2 + dependency_cmaui_port_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - dependency_server_pd + dependency_pd_server_port_2_nested1_pattern_4: + - nested1_pattern_4 + - dependency_pd_server_port_2 + dependency_cmaui_port_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_packet_internal_network_1: + - packet_internal_network_1 + - dependency + link_pd_server_port_1_nested1_pattern_4: + - nested1_pattern_4 + - link_pd_server_port_1 + dependency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + local_storage_server_1b_pd_1: + - abstract_pd_server_1b_1 + - local_storage_pd_server_1b + local_storage_server_pd_nested1_pattern_4: + - nested1_pattern_4 + - local_storage_server_pd + local_storage_server_1b_pd_2: + - abstract_pd_server_1b + - local_storage_pd_server_1b + dependency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + link_pd_server_1b_port_1: + - abstract_pd_server_1b_1 + - link_pd_server_1b_pd_server_1b_port + link_ps_server_1b_port_1: + - abstract_pd_server_1b + - link_pd_server_1b_ps_server_1b_port + dependency_packet_external_network_1: + - packet_external_network_1 + - dependency + dependency_ps_server_1b_port_1: + - abstract_pd_server_1b + - dependency_pd_server_1b_ps_server_1b_port + local_storage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + local_storage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + dependency_server_1b_pd_1: + - abstract_pd_server_1b_1 + - dependency_pd_server_1b + dependency_nested1_pattern_4: + - nested1_pattern_4 + - dependency + dependency_server_1b_pd_2: + - abstract_pd_server_1b + - dependency_pd_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 878cd77858..65368cfc2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -64,6 +64,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -354,6 +360,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -452,6 +459,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -619,6 +632,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1412,6 +1426,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1419,6 +1434,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1757,6 +1773,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1857,6 +1874,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1882,6 +1900,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1907,6 +1926,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3053,6 +3073,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -3463,6 +3489,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3547,6 +3574,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -3584,6 +3617,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index b43eaf085c..c79149bea1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index 19588bd520..674a9d6a5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -56,6 +56,11 @@ topology_template: vm_image_name: type: string required: true + port_oam_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: oam_server_1c2_oam_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_oam_port_exCP_naming replacement_policy: get_input: - port_oam_port_replacement_policy - index_value + mac_requirements: + get_input: port_oam_port_mac_requirements + order: + get_input: port_oam_port_order + exCP_naming: + get_input: port_oam_port_exCP_naming vlan_requirements: get_input: port_oam_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_port_ip_requirements network_role_tag: get_input: port_oam_port_network_role_tag - mac_requirements: - get_input: port_oam_port_mac_requirements - order: - get_input: port_oam_port_order network_role: get_input: port_oam_port_network_role - subnetpoolid: - get_input: port_oam_port_subnetpoolid fixed_ips: get_input: - port_oam_port_fixed_ips - index_value + subnetpoolid: + get_input: port_oam_port_subnetpoolid network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index 53bc450834..71c4d654a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index 6a2ec1c378..633d5d087b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index b3f2be5806..07199eb1c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -1,1463 +1,1474 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- p1:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- p2:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- cmaui_1c1_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- ps_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- packet_internal_network_name:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: PD server names
- entry_schema:
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- oam_server_1c2_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- cmaui_1c1_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- ps_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- cmaui_1c1_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- packet_external_network_name:
- hidden: false
- immutable: false
- type: string
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- ps_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PS server
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- ps_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: Ps Image server
- net:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: PD Image server
- oam_server_1c2_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- oam_server_1c2_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- node_templates:
- abstract_cmaui_1c1:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - packet_internal_network
- - packet_internal_network
- compute_cmaui_1c1_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: cmaui_1c1_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_name:
- - get_input:
- - cmaui_1c1_names
- - 1
- - get_input:
- - cmaui_1c1_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_cmaui_1c1_cmaui_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network
- relationship: tosca.relationships.network.LinksTo
- abstract_pd_server_1b:
- type: org.openecomp.resource.abstract.nodes.pd_server_1b
- directives:
- - substitutable
- properties:
- compute_pd_server_1b_name:
- - get_input:
- - pd_server_1b_names
- - 0
- vm_flavor_name:
- get_input: pd_server_1b_flavor
- vm_image_name:
- get_input: pd_server_1b_image
- port_pd_server_1b_port_replacement_policy:
- - AUTO
- port_pd_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_1b_ips
- - 0
- port_pd_server_1b_port_network:
- - get_input: net
- compute_pd_server_1b_availability_zone:
- - get_input: availability_zone_0
- port_pd_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_ps_server_1b:
- type: org.openecomp.resource.abstract.nodes.ps_server_1b
- directives:
- - substitutable
- properties:
- port_ps_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_1b_ips
- - 0
- vm_flavor_name:
- get_input: ps_server_1b_flavor
- port_ps_server_1b_port_network:
- - get_input: net
- port_ps_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: ps_server_1b_image
- port_ps_server_1b_port_replacement_policy:
- - AUTO
- compute_ps_server_1b_availability_zone:
- - get_input: availability_zone_0
- compute_ps_server_1b_name:
- - get_input:
- - ps_server_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_ps_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- packet_external_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_external_network_name
- packet_internal_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_internal_network_name
- abstract_oam_server_1c2_1:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 1
- port_oam_port_network:
- - packet_external_network
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_external_network
- relationship: tosca.relationships.network.LinksTo
- abstract_oam_server_1c2_0:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 0
- port_oam_port_network:
- - packet_internal_network
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network
- relationship: tosca.relationships.network.LinksTo
- groups:
- nested1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested1.yml
- description: nested1
- members:
- - packet_external_network
- - packet_internal_network
- - abstract_ps_server_1b
- - abstract_oam_server_1c2_0
- - abstract_oam_server_1c2_1
- - abstract_pd_server_1b
- - abstract_cmaui_1c1
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested1
- capabilities:
- disk.capacity_server_1b_pd:
- - abstract_pd_server_1b
- - disk.capacity_pd_server_1b
- disk.device.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.device.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.bytes.rate_ps_server_1b
- disk.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.usage_server_1b_pd:
- - abstract_pd_server_1b
- - disk.usage_pd_server_1b
- disk.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.iops_oam_server_1c2
- disk.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.usage_oam_server_1c2
- disk.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- feature_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- disk.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.usage_oam_server_1c2
- network.incoming.bytes_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.bytes_pd_server_1b_pd_server_1b_port
- feature_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- disk.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- disk.device.iops_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.iops_ps_server_1b
- network.outgoing.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- disk.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.iops_oam_server_1c2
- network.outgoing.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- network.outgoing.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- network.outgoing.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- disk.device.iops_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.iops_pd_server_1b
- network.incoming.packets_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.packets_pd_server_1b_pd_server_1b_port
- attachment_ps_server_1b_port:
- - abstract_ps_server_1b
- - attachment_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests.rate_oam_server_1c2
- forwarder_ps_server_1b_port:
- - abstract_ps_server_1b
- - forwarder_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.bytes.rate_pd_server_1b
- disk.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes.rate_oam_server_1c2
- disk.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes.rate_oam_server_1c2
- scalable_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - scalable_oam_server_1c2
- disk.latency_server_1b_pd:
- - abstract_pd_server_1b
- - disk.latency_pd_server_1b
- scalable_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - scalable_oam_server_1c2
- disk.device.read.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.requests.rate_pd_server_1b
- disk.device.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.read.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.requests.rate_ps_server_1b
- disk.device.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.usage_oam_server_1c2
- disk.device.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.capacity_oam_server_1c2
- disk.device.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.capacity_oam_server_1c2
- binding_server_1b_ps:
- - abstract_ps_server_1b
- - binding_ps_server_1b
- binding_server_1b_pd:
- - abstract_pd_server_1b
- - binding_pd_server_1b
- disk.device.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.usage_oam_server_1c2
- memory.usage_server_1b_pd:
- - abstract_pd_server_1b
- - memory.usage_pd_server_1b
- network.outpoing.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outpoing.packets_oam_server_1c2_oam_port
- network.outpoing.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outpoing.packets_oam_server_1c2_oam_port
- binding_cmaui_port_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- binding_cmaui_port_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- memory.usage_server_1b_ps:
- - abstract_ps_server_1b
- - memory.usage_ps_server_1b
- cpu_util_server_1b_pd:
- - abstract_pd_server_1b
- - cpu_util_pd_server_1b
- cpu_util_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_util_oam_server_1c2
- cpu_util_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_util_oam_server_1c2
- memory_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory_oam_server_1c2
- memory_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory_oam_server_1c2
- disk.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes_oam_server_1c2
- disk.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes_oam_server_1c2
- memory.resident_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.resident_oam_server_1c2
- memory.resident_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.resident_oam_server_1c2
- cpu_util_server_1b_ps:
- - abstract_ps_server_1b
- - cpu_util_ps_server_1b
- network.incoming.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- network.incoming.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- os_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - os_oam_server_1c2
- disk.device.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- instance_server_1b_pd:
- - abstract_pd_server_1b
- - instance_pd_server_1b
- disk.device.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- os_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - os_oam_server_1c2
- disk.device.write.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.bytes_pd_server_1b
- disk.device.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- disk.device.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- feature_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2
- disk.device.write.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.bytes_ps_server_1b
- network.incoming.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- vcpus_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- network.incoming.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- feature_cmaui_port_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- network.incoming.bytes.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
- network.outgoing.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes_oam_server_1c2_oam_port
- feature_cmaui_port_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- instance_server_1b_ps:
- - abstract_ps_server_1b
- - instance_ps_server_1b
- feature_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2
- network.outgoing.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes_oam_server_1c2_oam_port
- disk.device.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- instance_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- cpu.delta_server_1b_ps:
- - abstract_ps_server_1b
- - cpu.delta_ps_server_1b
- instance_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- disk.device.read.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests.rate_oam_server_1c2
- disk.device.read.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests.rate_oam_server_1c2
- attachment_oam_port_2:
- - abstract_oam_server_1c2_1
- - attachment_oam_server_1c2_oam_port
- disk.device.write.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.bytes.rate_pd_server_1b
- disk.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.capacity_oam_server_1c2
- disk.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.capacity_oam_server_1c2
- cpu.delta_server_1b_pd:
- - abstract_pd_server_1b
- - cpu.delta_pd_server_1b
- attachment_oam_port_1:
- - abstract_oam_server_1c2_0
- - attachment_oam_server_1c2_oam_port
- disk.device.write.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.requests_pd_server_1b
- disk.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes.rate_oam_server_1c2
- disk.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes.rate_oam_server_1c2
- endpoint_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- network.outgoing.packets.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port
- endpoint_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- disk.device.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- disk.device.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- disk.device.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- network.incoming.bytes_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.bytes_ps_server_1b_ps_server_1b_port
- attachment_pd_server_1b_port:
- - abstract_pd_server_1b
- - attachment_pd_server_1b_pd_server_1b_port
- vcpus_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- binding_ps_server_1b_port:
- - abstract_ps_server_1b
- - binding_ps_server_1b_ps_server_1b_port
- disk.device.write.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.bytes.rate_ps_server_1b
- forwarder_cmaui_port_2:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- forwarder_cmaui_port_1:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- disk.device.write.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.requests_ps_server_1b
- disk.device.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.latency_oam_server_1c2
- disk.device.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.latency_oam_server_1c2
- feature_packet_external_network:
- - packet_external_network
- - feature
- disk.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- disk.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- disk.device.read.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.requests_pd_server_1b
- disk.read.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.requests_pd_server_1b
- cpu_util_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- disk.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.allocation_oam_server_1c2
- disk.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.allocation_oam_server_1c2
- cpu_util_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- disk.device.read.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.requests_ps_server_1b
- binding_pd_server_1b_port:
- - abstract_pd_server_1b
- - binding_pd_server_1b_pd_server_1b_port
- disk.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes_oam_server_1c2
- disk.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes_oam_server_1c2
- cpu_server_1b_pd:
- - abstract_pd_server_1b
- - cpu_pd_server_1b
- binding_oam_port_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2_oam_port
- disk.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- disk.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- disk.allocation_server_1b_pd:
- - abstract_pd_server_1b
- - disk.allocation_pd_server_1b
- binding_oam_port_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2_oam_port
- disk.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- disk.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- host_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- host_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- cpu_server_1b_ps:
- - abstract_ps_server_1b
- - cpu_ps_server_1b
- network.outpoing.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- disk.allocation_server_1b_ps:
- - abstract_ps_server_1b
- - disk.allocation_ps_server_1b
- network.outpoing.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- disk.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.latency_oam_server_1c2
- disk.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.latency_oam_server_1c2
- disk.read.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.requests_ps_server_1b
- disk.capacity_server_1b_ps:
- - abstract_ps_server_1b
- - disk.capacity_ps_server_1b
- memory.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.usage_oam_server_1c2
- network.outpoing.packets_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outpoing.packets_ps_server_1b_ps_server_1b_port
- memory.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.usage_oam_server_1c2
- disk.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.requests_oam_server_1c2
- attachment_packet_external_network:
- - packet_external_network
- - attachment
- disk.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.requests_oam_server_1c2
- disk.usage_server_1b_ps:
- - abstract_ps_server_1b
- - disk.usage_ps_server_1b
- disk.root.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.root.size_oam_server_1c2
- memory.resident_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- disk.root.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.root.size_oam_server_1c2
- memory.resident_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- network.incoming.bytes.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port
- network.incoming.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- os_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- os_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- instance_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - instance_oam_server_1c2
- instance_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - instance_oam_server_1c2
- network.incoming.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- vcpus_server_1b_pd:
- - abstract_pd_server_1b
- - vcpus_pd_server_1b
- memory.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- disk.write.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.bytes.rate_ps_server_1b
- memory.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- binding_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- memory_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- binding_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- feature_ps_server_1b_port:
- - abstract_ps_server_1b
- - feature_ps_server_1b_ps_server_1b_port
- disk.device.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.iops_oam_server_1c2
- vcpus_server_1b_ps:
- - abstract_ps_server_1b
- - vcpus_ps_server_1b
- disk.device.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.iops_oam_server_1c2
- disk.write.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.bytes.rate_pd_server_1b
- forwarder_oam_port_1:
- - abstract_oam_server_1c2_0
- - forwarder_oam_server_1c2_oam_port
- forwarder_oam_port_2:
- - abstract_oam_server_1c2_1
- - forwarder_oam_server_1c2_oam_port
- binding_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2
- binding_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2
- os_server_1b_pd:
- - abstract_pd_server_1b
- - os_pd_server_1b
- attachment_packet_internal_network:
- - packet_internal_network
- - attachment
- network.outgoing.packets.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
- memory_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- disk.device.latency_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.latency_pd_server_1b
- disk.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests_oam_server_1c2
- disk.device.usage_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.usage_pd_server_1b
- disk.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests_oam_server_1c2
- vcpus_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - vcpus_oam_server_1c2
- vcpus_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - vcpus_oam_server_1c2
- os_server_1b_ps:
- - abstract_ps_server_1b
- - os_ps_server_1b
- disk.device.latency_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.latency_ps_server_1b
- disk.ephemeral.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.ephemeral.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.root.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.device.usage_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.usage_ps_server_1b
- disk.root.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.read.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.bytes_ps_server_1b
- network.incoming.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- disk.device.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.ephemeral.size_server_1b_pd:
- - abstract_pd_server_1b
- - disk.ephemeral.size_pd_server_1b
- disk.device.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests_oam_server_1c2
- disk.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- memory_server_1b_ps:
- - abstract_ps_server_1b
- - memory_ps_server_1b
- network.incoming.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- network.outgoing.bytes.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port
- network.incoming.packets.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- disk.device.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- disk.device.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- feature_server_1b_ps:
- - abstract_ps_server_1b
- - feature_ps_server_1b
- disk.write.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.requests.rate_ps_server_1b
- disk.device.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests_oam_server_1c2
- disk.device.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.device.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- host_server_1b_pd:
- - abstract_pd_server_1b
- - host_pd_server_1b
- disk.device.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests_oam_server_1c2
- disk.ephemeral.size_server_1b_ps:
- - abstract_ps_server_1b
- - disk.ephemeral.size_ps_server_1b
- disk.read.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.bytes_pd_server_1b
- host_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - host_oam_server_1c2
- disk.device.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests_oam_server_1c2
- memory_server_1b_pd:
- - abstract_pd_server_1b
- - memory_pd_server_1b
- host_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - host_oam_server_1c2
- network.incoming.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- disk.write.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.bytes_ps_server_1b
- network.incoming.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- end_point_packet_external_network:
- - packet_external_network
- - end_point
- network.outpoing.packets_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outpoing.packets_pd_server_1b_pd_server_1b_port
- feature_server_1b_pd:
- - abstract_pd_server_1b
- - feature_pd_server_1b
- disk.device.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- disk.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- disk.device.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- disk.device.allocation_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.allocation_pd_server_1b
- disk.root.size_server_1b_ps:
- - abstract_ps_server_1b
- - disk.root.size_ps_server_1b
- disk.device.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.allocation_oam_server_1c2
- disk.device.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.allocation_oam_server_1c2
- network.outgoing.bytes_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
- disk.write.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.bytes_pd_server_1b
- disk.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- disk.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- disk.device.capacity_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.capacity_pd_server_1b
- network.outgoing.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- disk.root.size_server_1b_pd:
- - abstract_pd_server_1b
- - disk.root.size_pd_server_1b
- cpu_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- network.outgoing.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- cpu_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- cpu_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_oam_server_1c2
- disk.device.capacity_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.capacity_ps_server_1b
- disk.write.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.requests.rate_pd_server_1b
- cpu_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_oam_server_1c2
- link_packet_external_network:
- - packet_external_network
- - link
- disk.device.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- disk.device.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- host_server_1b_ps:
- - abstract_ps_server_1b
- - host_ps_server_1b
- disk.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests.rate_oam_server_1c2
- cpu.delta_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu.delta_oam_server_1c2
- disk.iops_server_1b_pd:
- - abstract_pd_server_1b
- - disk.iops_pd_server_1b
- disk.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests.rate_oam_server_1c2
- disk.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- disk.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- disk.device.allocation_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.allocation_ps_server_1b
- end_point_packet_internal_network:
- - packet_internal_network
- - end_point
- network.incoming.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes_oam_server_1c2_oam_port
- feature_packet_internal_network:
- - packet_internal_network
- - feature
- network.incoming.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes_oam_server_1c2_oam_port
- forwarder_pd_server_1b_port:
- - abstract_pd_server_1b
- - forwarder_pd_server_1b_pd_server_1b_port
- disk.device.write.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.requests.rate_ps_server_1b
- attachment_cmaui_port_2:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- network.outgoing.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- network.outgoing.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- disk.iops_server_1b_ps:
- - abstract_ps_server_1b
- - disk.iops_ps_server_1b
- disk.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- network.outgoing.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- network.outgoing.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- attachment_cmaui_port_1:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- disk.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- disk.ephemeral.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.ephemeral.size_oam_server_1c2
- disk.read.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.bytes.rate_ps_server_1b
- disk.ephemeral.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.ephemeral.size_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- disk.device.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- network.incoming.packets_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.packets_ps_server_1b_ps_server_1b_port
- disk.write.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.requests_ps_server_1b
- feature_pd_server_1b_port:
- - abstract_pd_server_1b
- - feature_pd_server_1b_pd_server_1b_port
- disk.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- scalable_server_1b_ps:
- - abstract_ps_server_1b
- - scalable_ps_server_1b
- disk.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- cpu.delta_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu.delta_oam_server_1c2
- disk.device.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes.rate_oam_server_1c2
- scalable_server_1b_pd:
- - abstract_pd_server_1b
- - scalable_pd_server_1b
- disk.write.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.requests_pd_server_1b
- disk.latency_server_1b_ps:
- - abstract_ps_server_1b
- - disk.latency_ps_server_1b
- disk.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- network.outgoing.bytes.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
- disk.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- feature_oam_port_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2_oam_port
- feature_oam_port_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2_oam_port
- network.incoming.packets.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
- disk.device.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- disk.read.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.bytes.rate_pd_server_1b
- scalable_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- link_packet_internal_network:
- - packet_internal_network
- - link
- disk.device.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- scalable_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- cpu.delta_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- endpoint_server_1b_pd:
- - abstract_pd_server_1b
- - endpoint_pd_server_1b
- cpu.delta_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- endpoint_server_1b_ps:
- - abstract_ps_server_1b
- - endpoint_ps_server_1b
- network.incoming.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- network.outgoing.bytes_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.bytes_ps_server_1b_ps_server_1b_port
- network.incoming.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- disk.device.read.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.bytes_ps_server_1b
- disk.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.device.write.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.requests.rate_pd_server_1b
- memory.resident_server_1b_pd:
- - abstract_pd_server_1b
- - memory.resident_pd_server_1b
- disk.device.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes_oam_server_1c2
- disk.device.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes_oam_server_1c2
- memory.resident_server_1b_ps:
- - abstract_ps_server_1b
- - memory.resident_ps_server_1b
- disk.device.read.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.bytes_pd_server_1b
- endpoint_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - endpoint_oam_server_1c2
- endpoint_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - endpoint_oam_server_1c2
- requirements:
- dependency_server_1b_pd:
- - abstract_pd_server_1b
- - dependency_pd_server_1b
- link_pd_server_1b_port:
- - abstract_pd_server_1b
- - link_pd_server_1b_pd_server_1b_port
- local_storage_server_1b_ps:
- - abstract_ps_server_1b
- - local_storage_ps_server_1b
- dependency_oam_port_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2_oam_port
- dependency_oam_port_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2_oam_port
- dependency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- dependency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- link_ps_server_1b_port:
- - abstract_ps_server_1b
- - link_ps_server_1b_ps_server_1b_port
- local_storage_server_1b_pd:
- - abstract_pd_server_1b
- - local_storage_pd_server_1b
- dependency_ps_server_1b_port:
- - abstract_ps_server_1b
- - dependency_ps_server_1b_ps_server_1b_port
- dependency_server_1b_ps:
- - abstract_ps_server_1b
- - dependency_ps_server_1b
- dependency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2
- dependency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2
- local_storage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - local_storage_oam_server_1c2
- local_storage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - local_storage_oam_server_1c2
- dependency_pd_server_1b_port:
- - abstract_pd_server_1b
- - dependency_pd_server_1b_pd_server_1b_port
- dependency_cmaui_port_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_packet_internal_network:
- - packet_internal_network
- - dependency
- local_storage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- local_storage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- dependency_cmaui_port_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_packet_external_network:
- - packet_external_network
- - dependency
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + immutable: false + type: string + description: UID of OAM network + cmaui_1c1_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + ps_server_1b_ips: + hidden: false + immutable: false + type: string + packet_internal_network_name: + hidden: false + immutable: false + type: string + pd_server_1b_names: + hidden: false + immutable: false + type: list + description: PD server names + entry_schema: + type: string + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + oam_server_1c2_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + cmaui_1c1_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + ps_server_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + cmaui_1c1_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + pd_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + pd_server_1b_ips: + hidden: false + immutable: false + type: string + packet_external_network_name: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + ps_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PS server + cmaui_oam_ips: + hidden: false + immutable: false + type: string + ps_server_1b_image: + hidden: false + immutable: false + type: string + description: Ps Image server + net: + hidden: false + immutable: false + type: string + pd_server_1b_image: + hidden: false + immutable: false + type: string + description: PD Image server + oam_server_1c2_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + oam_server_1c2_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + node_templates: + abstract_cmaui_1c1: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1 + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - packet_internal_network + - packet_internal_network + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_name: + - get_input: + - cmaui_1c1_names + - 1 + - get_input: + - cmaui_1c1_names + - 0 + port_cmaui_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_cmaui_1c1_cmaui_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network + relationship: tosca.relationships.network.LinksTo + abstract_pd_server_1b: + type: org.openecomp.resource.abstract.nodes.pd_server_1b + directives: + - substitutable + properties: + compute_pd_server_1b_name: + - get_input: + - pd_server_1b_names + - 0 + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_1b_ips + - 0 + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server_1b: + type: org.openecomp.resource.abstract.nodes.ps_server_1b + directives: + - substitutable + properties: + port_ps_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true + port_ps_server_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: ps_server_1b_image + port_ps_server_1b_port_replacement_policy: + - AUTO + compute_ps_server_1b_availability_zone: + - get_input: availability_zone_0 + compute_ps_server_1b_name: + - get_input: + - ps_server_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_ps_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + packet_external_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_name + packet_internal_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_name + abstract_oam_server_1c2_1: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 1 + port_oam_port_network: + - packet_external_network + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_external_network + relationship: tosca.relationships.network.LinksTo + abstract_oam_server_1c2_0: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 0 + port_oam_port_network: + - packet_internal_network + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network + relationship: tosca.relationships.network.LinksTo + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: nested1 + members: + - packet_external_network + - packet_internal_network + - abstract_ps_server_1b + - abstract_oam_server_1c2_0 + - abstract_oam_server_1c2_1 + - abstract_pd_server_1b + - abstract_cmaui_1c1 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + capabilities: + disk.capacity_server_1b_pd: + - abstract_pd_server_1b + - disk.capacity_pd_server_1b + disk.device.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.device.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.bytes.rate_ps_server_1b + disk.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.usage_server_1b_pd: + - abstract_pd_server_1b + - disk.usage_pd_server_1b + disk.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.iops_oam_server_1c2 + disk.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.usage_oam_server_1c2 + disk.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + feature_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + disk.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.usage_oam_server_1c2 + network.incoming.bytes_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port + feature_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + disk.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + disk.device.iops_server_1b_ps: + - abstract_ps_server_1b + - disk.device.iops_ps_server_1b + network.outgoing.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + disk.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.iops_oam_server_1c2 + network.outgoing.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + network.outgoing.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + disk.device.iops_server_1b_pd: + - abstract_pd_server_1b + - disk.device.iops_pd_server_1b + network.incoming.packets_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port + attachment_ps_server_1b_port: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests.rate_oam_server_1c2 + forwarder_ps_server_1b_port: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.bytes.rate_pd_server_1b + disk.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes.rate_oam_server_1c2 + disk.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes.rate_oam_server_1c2 + scalable_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - scalable_oam_server_1c2 + disk.latency_server_1b_pd: + - abstract_pd_server_1b + - disk.latency_pd_server_1b + scalable_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - scalable_oam_server_1c2 + disk.device.read.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.requests.rate_pd_server_1b + disk.device.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.read.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.requests.rate_ps_server_1b + disk.device.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.usage_oam_server_1c2 + disk.device.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.capacity_oam_server_1c2 + disk.device.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.capacity_oam_server_1c2 + binding_server_1b_ps: + - abstract_ps_server_1b + - binding_ps_server_1b + binding_server_1b_pd: + - abstract_pd_server_1b + - binding_pd_server_1b + disk.device.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.usage_oam_server_1c2 + memory.usage_server_1b_pd: + - abstract_pd_server_1b + - memory.usage_pd_server_1b + network.outpoing.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_port + network.outpoing.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_port + binding_cmaui_port_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + binding_cmaui_port_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + memory.usage_server_1b_ps: + - abstract_ps_server_1b + - memory.usage_ps_server_1b + cpu_util_server_1b_pd: + - abstract_pd_server_1b + - cpu_util_pd_server_1b + cpu_util_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_util_oam_server_1c2 + cpu_util_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_util_oam_server_1c2 + memory_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory_oam_server_1c2 + memory_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory_oam_server_1c2 + disk.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes_oam_server_1c2 + disk.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes_oam_server_1c2 + memory.resident_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.resident_oam_server_1c2 + memory.resident_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.resident_oam_server_1c2 + cpu_util_server_1b_ps: + - abstract_ps_server_1b + - cpu_util_ps_server_1b + network.incoming.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + network.incoming.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + os_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - os_oam_server_1c2 + disk.device.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + instance_server_1b_pd: + - abstract_pd_server_1b + - instance_pd_server_1b + disk.device.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + os_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - os_oam_server_1c2 + disk.device.write.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.bytes_pd_server_1b + disk.device.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + disk.device.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + feature_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2 + disk.device.write.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.bytes_ps_server_1b + network.incoming.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + vcpus_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + network.incoming.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + feature_cmaui_port_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + network.incoming.bytes.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + network.outgoing.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes_oam_server_1c2_oam_port + feature_cmaui_port_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + instance_server_1b_ps: + - abstract_ps_server_1b + - instance_ps_server_1b + feature_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2 + network.outgoing.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_port + disk.device.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + instance_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + cpu.delta_server_1b_ps: + - abstract_ps_server_1b + - cpu.delta_ps_server_1b + instance_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + disk.device.read.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests.rate_oam_server_1c2 + disk.device.read.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests.rate_oam_server_1c2 + attachment_oam_port_2: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_port + disk.device.write.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.bytes.rate_pd_server_1b + disk.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.capacity_oam_server_1c2 + disk.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.capacity_oam_server_1c2 + cpu.delta_server_1b_pd: + - abstract_pd_server_1b + - cpu.delta_pd_server_1b + attachment_oam_port_1: + - abstract_oam_server_1c2_0 + - attachment_oam_server_1c2_oam_port + disk.device.write.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.requests_pd_server_1b + disk.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes.rate_oam_server_1c2 + disk.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes.rate_oam_server_1c2 + endpoint_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + network.outgoing.packets.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + endpoint_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + disk.device.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + disk.device.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + disk.device.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + network.incoming.bytes_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port + attachment_pd_server_1b_port: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port + vcpus_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + binding_ps_server_1b_port: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port + disk.device.write.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.bytes.rate_ps_server_1b + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + disk.device.write.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.requests_ps_server_1b + disk.device.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.latency_oam_server_1c2 + disk.device.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.latency_oam_server_1c2 + feature_packet_external_network: + - packet_external_network + - feature + disk.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + disk.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + disk.device.read.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.requests_pd_server_1b + disk.read.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.read.requests_pd_server_1b + cpu_util_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + disk.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.allocation_oam_server_1c2 + disk.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.allocation_oam_server_1c2 + cpu_util_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + disk.device.read.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.requests_ps_server_1b + binding_pd_server_1b_port: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port + disk.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes_oam_server_1c2 + disk.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes_oam_server_1c2 + cpu_server_1b_pd: + - abstract_pd_server_1b + - cpu_pd_server_1b + binding_oam_port_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_port + disk.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + disk.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + disk.allocation_server_1b_pd: + - abstract_pd_server_1b + - disk.allocation_pd_server_1b + binding_oam_port_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_port + disk.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + disk.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + host_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + host_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + cpu_server_1b_ps: + - abstract_ps_server_1b + - cpu_ps_server_1b + network.outpoing.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + disk.allocation_server_1b_ps: + - abstract_ps_server_1b + - disk.allocation_ps_server_1b + network.outpoing.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + disk.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.latency_oam_server_1c2 + disk.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.latency_oam_server_1c2 + disk.read.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.read.requests_ps_server_1b + disk.capacity_server_1b_ps: + - abstract_ps_server_1b + - disk.capacity_ps_server_1b + memory.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.usage_oam_server_1c2 + network.outpoing.packets_ps_server_1b_port: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port + memory.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.usage_oam_server_1c2 + disk.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.requests_oam_server_1c2 + attachment_packet_external_network: + - packet_external_network + - attachment + disk.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.requests_oam_server_1c2 + disk.usage_server_1b_ps: + - abstract_ps_server_1b + - disk.usage_ps_server_1b + disk.root.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.root.size_oam_server_1c2 + memory.resident_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + disk.root.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.root.size_oam_server_1c2 + memory.resident_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + network.incoming.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + os_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + os_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + instance_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - instance_oam_server_1c2 + instance_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - instance_oam_server_1c2 + network.incoming.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + vcpus_server_1b_pd: + - abstract_pd_server_1b + - vcpus_pd_server_1b + memory.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + disk.write.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.write.bytes.rate_ps_server_1b + memory.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + binding_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + memory_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + binding_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + feature_ps_server_1b_port: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port + disk.device.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.iops_oam_server_1c2 + vcpus_server_1b_ps: + - abstract_ps_server_1b + - vcpus_ps_server_1b + disk.device.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.iops_oam_server_1c2 + disk.write.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.write.bytes.rate_pd_server_1b + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port + binding_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2 + binding_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2 + os_server_1b_pd: + - abstract_pd_server_1b + - os_pd_server_1b + attachment_packet_internal_network: + - packet_internal_network + - attachment + network.outgoing.packets.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + memory_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + disk.device.latency_server_1b_pd: + - abstract_pd_server_1b + - disk.device.latency_pd_server_1b + disk.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests_oam_server_1c2 + disk.device.usage_server_1b_pd: + - abstract_pd_server_1b + - disk.device.usage_pd_server_1b + disk.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests_oam_server_1c2 + vcpus_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - vcpus_oam_server_1c2 + vcpus_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - vcpus_oam_server_1c2 + os_server_1b_ps: + - abstract_ps_server_1b + - os_ps_server_1b + disk.device.latency_server_1b_ps: + - abstract_ps_server_1b + - disk.device.latency_ps_server_1b + disk.ephemeral.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.ephemeral.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.root.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.device.usage_server_1b_ps: + - abstract_ps_server_1b + - disk.device.usage_ps_server_1b + disk.root.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.read.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.read.bytes_ps_server_1b + network.incoming.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + disk.device.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.ephemeral.size_server_1b_pd: + - abstract_pd_server_1b + - disk.ephemeral.size_pd_server_1b + disk.device.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests_oam_server_1c2 + disk.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + memory_server_1b_ps: + - abstract_ps_server_1b + - memory_ps_server_1b + network.incoming.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + network.outgoing.bytes.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + network.incoming.packets.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + disk.device.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + disk.device.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + feature_server_1b_ps: + - abstract_ps_server_1b + - feature_ps_server_1b + disk.write.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.write.requests.rate_ps_server_1b + disk.device.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests_oam_server_1c2 + disk.device.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.device.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + host_server_1b_pd: + - abstract_pd_server_1b + - host_pd_server_1b + disk.device.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests_oam_server_1c2 + disk.ephemeral.size_server_1b_ps: + - abstract_ps_server_1b + - disk.ephemeral.size_ps_server_1b + disk.read.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.read.bytes_pd_server_1b + host_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - host_oam_server_1c2 + disk.device.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests_oam_server_1c2 + memory_server_1b_pd: + - abstract_pd_server_1b + - memory_pd_server_1b + host_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - host_oam_server_1c2 + network.incoming.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_port + disk.write.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.write.bytes_ps_server_1b + network.incoming.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_port + end_point_packet_external_network: + - packet_external_network + - end_point + network.outpoing.packets_pd_server_1b_port: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port + feature_server_1b_pd: + - abstract_pd_server_1b + - feature_pd_server_1b + disk.device.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + disk.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + disk.device.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + disk.device.allocation_server_1b_pd: + - abstract_pd_server_1b + - disk.device.allocation_pd_server_1b + disk.root.size_server_1b_ps: + - abstract_ps_server_1b + - disk.root.size_ps_server_1b + disk.device.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.allocation_oam_server_1c2 + disk.device.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.allocation_oam_server_1c2 + network.outgoing.bytes_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + disk.write.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.write.bytes_pd_server_1b + disk.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + disk.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + disk.device.capacity_server_1b_pd: + - abstract_pd_server_1b + - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + disk.root.size_server_1b_pd: + - abstract_pd_server_1b + - disk.root.size_pd_server_1b + cpu_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + network.outgoing.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + cpu_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + cpu_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_oam_server_1c2 + disk.device.capacity_server_1b_ps: + - abstract_ps_server_1b + - disk.device.capacity_ps_server_1b + disk.write.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.write.requests.rate_pd_server_1b + cpu_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_oam_server_1c2 + link_packet_external_network: + - packet_external_network + - link + disk.device.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + disk.device.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + host_server_1b_ps: + - abstract_ps_server_1b + - host_ps_server_1b + disk.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests.rate_oam_server_1c2 + cpu.delta_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu.delta_oam_server_1c2 + disk.iops_server_1b_pd: + - abstract_pd_server_1b + - disk.iops_pd_server_1b + disk.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests.rate_oam_server_1c2 + disk.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + disk.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + disk.device.allocation_server_1b_ps: + - abstract_ps_server_1b + - disk.device.allocation_ps_server_1b + end_point_packet_internal_network: + - packet_internal_network + - end_point + network.incoming.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes_oam_server_1c2_oam_port + feature_packet_internal_network: + - packet_internal_network + - feature + network.incoming.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_port + forwarder_pd_server_1b_port: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port + disk.device.write.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.requests.rate_ps_server_1b + attachment_cmaui_port_2: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + network.outgoing.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + network.outgoing.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + disk.iops_server_1b_ps: + - abstract_ps_server_1b + - disk.iops_ps_server_1b + disk.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + network.outgoing.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + attachment_cmaui_port_1: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + disk.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + disk.ephemeral.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.ephemeral.size_oam_server_1c2 + disk.read.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.read.bytes.rate_ps_server_1b + disk.ephemeral.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.ephemeral.size_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + disk.device.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + network.incoming.packets_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port + disk.write.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.write.requests_ps_server_1b + feature_pd_server_1b_port: + - abstract_pd_server_1b + - feature_pd_server_1b_pd_server_1b_port + disk.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + scalable_server_1b_ps: + - abstract_ps_server_1b + - scalable_ps_server_1b + disk.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + cpu.delta_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu.delta_oam_server_1c2 + disk.device.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes.rate_oam_server_1c2 + scalable_server_1b_pd: + - abstract_pd_server_1b + - scalable_pd_server_1b + disk.write.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.write.requests_pd_server_1b + disk.latency_server_1b_ps: + - abstract_ps_server_1b + - disk.latency_ps_server_1b + disk.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + network.outgoing.bytes.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + disk.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + feature_oam_port_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_port + feature_oam_port_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_port + network.incoming.packets.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + disk.device.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + disk.read.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.read.bytes.rate_pd_server_1b + scalable_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + link_packet_internal_network: + - packet_internal_network + - link + disk.device.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + scalable_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + cpu.delta_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + endpoint_server_1b_pd: + - abstract_pd_server_1b + - endpoint_pd_server_1b + cpu.delta_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + endpoint_server_1b_ps: + - abstract_ps_server_1b + - endpoint_ps_server_1b + network.incoming.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + network.outgoing.bytes_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + network.incoming.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + disk.device.read.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.bytes_ps_server_1b + disk.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.device.write.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.requests.rate_pd_server_1b + memory.resident_server_1b_pd: + - abstract_pd_server_1b + - memory.resident_pd_server_1b + disk.device.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes_oam_server_1c2 + disk.device.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes_oam_server_1c2 + memory.resident_server_1b_ps: + - abstract_ps_server_1b + - memory.resident_ps_server_1b + disk.device.read.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.bytes_pd_server_1b + endpoint_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - endpoint_oam_server_1c2 + endpoint_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - endpoint_oam_server_1c2 + requirements: + dependency_server_1b_pd: + - abstract_pd_server_1b + - dependency_pd_server_1b + link_pd_server_1b_port: + - abstract_pd_server_1b + - link_pd_server_1b_pd_server_1b_port + local_storage_server_1b_ps: + - abstract_ps_server_1b + - local_storage_ps_server_1b + dependency_oam_port_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_port + dependency_oam_port_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_port + dependency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + dependency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + link_ps_server_1b_port: + - abstract_ps_server_1b + - link_ps_server_1b_ps_server_1b_port + local_storage_server_1b_pd: + - abstract_pd_server_1b + - local_storage_pd_server_1b + dependency_ps_server_1b_port: + - abstract_ps_server_1b + - dependency_ps_server_1b_ps_server_1b_port + dependency_server_1b_ps: + - abstract_ps_server_1b + - dependency_ps_server_1b + dependency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2 + dependency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2 + local_storage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - local_storage_oam_server_1c2 + local_storage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - local_storage_oam_server_1c2 + dependency_pd_server_1b_port: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port + dependency_cmaui_port_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_packet_internal_network: + - packet_internal_network + - dependency + local_storage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + local_storage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + dependency_cmaui_port_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_packet_external_network: + - packet_external_network + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index b521dae6db..80f9877600 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -64,6 +64,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -358,6 +364,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -794,6 +801,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -801,6 +809,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1012,6 +1021,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1179,6 +1194,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1554,6 +1570,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1567,6 +1584,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2262,6 +2280,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2269,6 +2288,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2607,6 +2627,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2707,6 +2728,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2732,6 +2754,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2757,6 +2780,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3903,6 +3927,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -4313,6 +4343,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4397,6 +4428,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -4434,6 +4471,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index b43eaf085c..c79149bea1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_1c1_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index f3d73a7950..3b43af97f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -56,6 +56,11 @@ topology_template: vm_image_name: type: string required: true + port_oam_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: oam_server_1c2_oam_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_oam_port_exCP_naming replacement_policy: get_input: - port_oam_port_replacement_policy - index_value + mac_requirements: + get_input: port_oam_port_mac_requirements + order: + get_input: port_oam_port_order + exCP_naming: + get_input: port_oam_port_exCP_naming vlan_requirements: get_input: port_oam_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_port_ip_requirements network_role_tag: get_input: port_oam_port_network_role_tag - mac_requirements: - get_input: port_oam_port_mac_requirements - order: - get_input: port_oam_port_order network_role: get_input: port_oam_port_network_role - subnetpoolid: - get_input: port_oam_port_subnetpoolid fixed_ips: get_input: - port_oam_port_fixed_ips - index_value + subnetpoolid: + get_input: port_oam_port_subnetpoolid network: get_input: - port_oam_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index 53bc450834..71c4d654a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index 6a2ec1c378..633d5d087b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index 3546708076..8055036678 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -1,1470 +1,1481 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- p1:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- p2:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- cmaui_1c1_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- ps_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- packet_internal_network_name:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: PD server names
- entry_schema:
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- oam_server_1c2_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- cmaui_1c1_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- ps_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- cmaui_1c1_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- packet_external_network_name:
- hidden: false
- immutable: false
- type: string
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- ps_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PS server
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- ps_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: Ps Image server
- net:
- hidden: false
- immutable: false
- type: string
- pd_server_1b_image:
- hidden: false
- immutable: false
- type: string
- description: PD Image server
- oam_server_1c2_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- oam_server_1c2_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- node_templates:
- abstract_cmaui_1c1:
- type: org.openecomp.resource.abstract.nodes.cmaui_1c1
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - packet_internal_network
- - packet_internal_network
- compute_cmaui_1c1_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- vm_flavor_name:
- get_input: cmaui_1c1_flavor
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_1c1_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- compute_cmaui_1c1_name:
- - get_input:
- - cmaui_1c1_names
- - 1
- - get_input:
- - cmaui_1c1_names
- - 0
- service_template_filter:
- substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_cmaui_1c1_cmaui_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network
- relationship: tosca.relationships.network.LinksTo
- abstract_pd_server_1b:
- type: org.openecomp.resource.abstract.nodes.pd_server_1b
- directives:
- - substitutable
- properties:
- compute_pd_server_1b_name:
- - get_input:
- - pd_server_1b_names
- - 0
- vm_flavor_name:
- get_input: pd_server_1b_flavor
- vm_image_name:
- get_input: pd_server_1b_image
- port_pd_server_1b_port_replacement_policy:
- - AUTO
- port_pd_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_pd_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - pd_server_1b_ips
- - 0
- port_pd_server_1b_port_network:
- - get_input: net
- compute_pd_server_1b_availability_zone:
- - get_input: availability_zone_0
- port_pd_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_ps_server_1b:
- type: org.openecomp.resource.abstract.nodes.ps_server_1b
- directives:
- - substitutable
- properties:
- port_ps_server_1b_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps_server_1b_port_fixed_ips:
- - ip_address:
- get_input:
- - ps_server_1b_ips
- - 0
- vm_flavor_name:
- get_input: ps_server_1b_flavor
- port_ps_server_1b_port_network:
- - get_input: net
- port_ps_server_1b_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- vm_image_name:
- get_input: ps_server_1b_image
- port_ps_server_1b_port_replacement_policy:
- - AUTO
- compute_ps_server_1b_availability_zone:
- - get_input: availability_zone_0
- compute_ps_server_1b_name:
- - get_input:
- - ps_server_1b_names
- - 1
- service_template_filter:
- substitute_service_template: Nested_ps_server_1bServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- packet_external_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_external_network_name
- packet_internal_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_internal_network_name
- abstract_oam_server_1c2_1:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 1
- port_oam_port_network:
- - packet_external_network
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_external_network
- relationship: tosca.relationships.network.LinksTo
- abstract_oam_server_1c2_0:
- type: org.openecomp.resource.abstract.nodes.oam_server_1c2
- directives:
- - substitutable
- properties:
- port_oam_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_oam_server_1c2_name:
- - get_input:
- - oam_server_1c2_names
- - 0
- port_oam_port_network:
- - packet_internal_network
- vm_flavor_name:
- get_input: oam_server_1c2_flavor
- compute_oam_server_1c2_availability_zone:
- - get_input: availability_zone_0
- port_oam_port_fixed_ips:
- - ip_address:
- get_input:
- - cmaui_oam_ips
- - 1
- vm_image_name:
- get_input: oam_server_1c2_image
- port_oam_port_ip_requirements:
- - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_oam_port_replacement_policy:
- - AUTO
- service_template_filter:
- substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_oam_server_1c2_oam_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_internal_network
- relationship: tosca.relationships.network.LinksTo
- groups:
- nested1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested1.yml
- description: nested1
- members:
- - packet_external_network
- - packet_internal_network
- - abstract_ps_server_1b
- - abstract_oam_server_1c2_0
- - abstract_oam_server_1c2_1
- - abstract_pd_server_1b
- - abstract_cmaui_1c1
- outputs:
- all_pattern_attr_1:
- description: all_pattern_attr_1
- value:
- get_attribute:
- - abstract_oam_server_1c2_1
- - oam_server_1c2_accessIPv4
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested1
- capabilities:
- disk.capacity_server_1b_pd:
- - abstract_pd_server_1b
- - disk.capacity_pd_server_1b
- disk.device.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.device.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.bytes.rate_ps_server_1b
- disk.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes_cmaui_1c1
- disk.usage_server_1b_pd:
- - abstract_pd_server_1b
- - disk.usage_pd_server_1b
- disk.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.iops_oam_server_1c2
- disk.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.usage_oam_server_1c2
- disk.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- feature_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- disk.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.usage_oam_server_1c2
- network.incoming.bytes_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.bytes_pd_server_1b_pd_server_1b_port
- feature_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1
- disk.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.requests_cmaui_1c1
- disk.device.iops_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.iops_ps_server_1b
- network.outgoing.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- disk.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.iops_oam_server_1c2
- network.outgoing.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes_cmaui_1c1_cmaui_port
- network.outgoing.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- network.outgoing.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.packets.rate_oam_server_1c2_oam_port
- disk.device.iops_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.iops_pd_server_1b
- network.incoming.packets_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.packets_pd_server_1b_pd_server_1b_port
- attachment_ps_server_1b_port:
- - abstract_ps_server_1b
- - attachment_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests.rate_oam_server_1c2
- forwarder_ps_server_1b_port:
- - abstract_ps_server_1b
- - forwarder_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.bytes.rate_pd_server_1b
- disk.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes.rate_oam_server_1c2
- disk.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes.rate_oam_server_1c2
- scalable_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - scalable_oam_server_1c2
- disk.latency_server_1b_pd:
- - abstract_pd_server_1b
- - disk.latency_pd_server_1b
- scalable_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - scalable_oam_server_1c2
- disk.device.read.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.requests.rate_pd_server_1b
- disk.device.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.read.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes_cmaui_1c1
- disk.device.read.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.requests.rate_ps_server_1b
- disk.device.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.usage_oam_server_1c2
- disk.device.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.capacity_oam_server_1c2
- disk.device.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.capacity_oam_server_1c2
- binding_server_1b_ps:
- - abstract_ps_server_1b
- - binding_ps_server_1b
- binding_server_1b_pd:
- - abstract_pd_server_1b
- - binding_pd_server_1b
- disk.device.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.usage_oam_server_1c2
- memory.usage_server_1b_pd:
- - abstract_pd_server_1b
- - memory.usage_pd_server_1b
- network.outpoing.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outpoing.packets_oam_server_1c2_oam_port
- network.outpoing.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outpoing.packets_oam_server_1c2_oam_port
- binding_cmaui_port_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- binding_cmaui_port_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1_cmaui_port
- memory.usage_server_1b_ps:
- - abstract_ps_server_1b
- - memory.usage_ps_server_1b
- cpu_util_server_1b_pd:
- - abstract_pd_server_1b
- - cpu_util_pd_server_1b
- cpu_util_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_util_oam_server_1c2
- cpu_util_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_util_oam_server_1c2
- memory_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory_oam_server_1c2
- memory_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory_oam_server_1c2
- disk.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes_oam_server_1c2
- disk.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes_oam_server_1c2
- memory.resident_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.resident_oam_server_1c2
- memory.resident_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.resident_oam_server_1c2
- cpu_util_server_1b_ps:
- - abstract_ps_server_1b
- - cpu_util_ps_server_1b
- network.incoming.bytes_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- network.incoming.bytes_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes_cmaui_1c1_cmaui_port
- os_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - os_oam_server_1c2
- disk.device.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- instance_server_1b_pd:
- - abstract_pd_server_1b
- - instance_pd_server_1b
- disk.device.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.iops_cmaui_1c1
- os_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - os_oam_server_1c2
- disk.device.write.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.bytes_pd_server_1b
- disk.device.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- disk.device.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.allocation_cmaui_1c1
- feature_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2
- disk.device.write.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.bytes_ps_server_1b
- network.incoming.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- vcpus_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- network.incoming.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets.rate_cmaui_1c1_cmaui_port
- feature_cmaui_port_1:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- network.incoming.bytes.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port
- network.outgoing.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes_oam_server_1c2_oam_port
- feature_cmaui_port_2:
- - abstract_cmaui_1c1
- - feature_cmaui_1c1_cmaui_port
- instance_server_1b_ps:
- - abstract_ps_server_1b
- - instance_ps_server_1b
- feature_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2
- network.outgoing.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes_oam_server_1c2_oam_port
- disk.device.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- instance_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- cpu.delta_server_1b_ps:
- - abstract_ps_server_1b
- - cpu.delta_ps_server_1b
- instance_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - instance_cmaui_1c1
- disk.device.read.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests.rate_oam_server_1c2
- disk.device.read.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests.rate_oam_server_1c2
- attachment_oam_port_2:
- - abstract_oam_server_1c2_1
- - attachment_oam_server_1c2_oam_port
- disk.device.write.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.bytes.rate_pd_server_1b
- disk.capacity_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.capacity_oam_server_1c2
- disk.capacity_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.capacity_oam_server_1c2
- cpu.delta_server_1b_pd:
- - abstract_pd_server_1b
- - cpu.delta_pd_server_1b
- attachment_oam_port_1:
- - abstract_oam_server_1c2_0
- - attachment_oam_server_1c2_oam_port
- disk.device.write.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.requests_pd_server_1b
- disk.write.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.bytes.rate_oam_server_1c2
- disk.write.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.bytes.rate_oam_server_1c2
- endpoint_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- network.outgoing.packets.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port
- endpoint_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - endpoint_cmaui_1c1
- disk.device.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- disk.device.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.capacity_cmaui_1c1
- disk.device.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.usage_cmaui_1c1
- network.incoming.bytes_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.bytes_ps_server_1b_ps_server_1b_port
- attachment_pd_server_1b_port:
- - abstract_pd_server_1b
- - attachment_pd_server_1b_pd_server_1b_port
- vcpus_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - vcpus_cmaui_1c1
- binding_ps_server_1b_port:
- - abstract_ps_server_1b
- - binding_ps_server_1b_ps_server_1b_port
- disk.device.write.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.bytes.rate_ps_server_1b
- forwarder_cmaui_port_2:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- forwarder_cmaui_port_1:
- - abstract_cmaui_1c1
- - forwarder_cmaui_1c1_cmaui_port
- disk.device.write.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.requests_ps_server_1b
- disk.device.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.latency_oam_server_1c2
- disk.device.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.latency_oam_server_1c2
- feature_packet_external_network:
- - packet_external_network
- - feature
- disk.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- disk.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests.rate_cmaui_1c1
- disk.device.read.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.requests_pd_server_1b
- disk.read.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.requests_pd_server_1b
- cpu_util_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- disk.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.allocation_oam_server_1c2
- disk.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.allocation_oam_server_1c2
- cpu_util_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_util_cmaui_1c1
- disk.device.read.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.requests_ps_server_1b
- binding_pd_server_1b_port:
- - abstract_pd_server_1b
- - binding_pd_server_1b_pd_server_1b_port
- disk.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.bytes_oam_server_1c2
- disk.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.bytes_oam_server_1c2
- cpu_server_1b_pd:
- - abstract_pd_server_1b
- - cpu_pd_server_1b
- binding_oam_port_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2_oam_port
- disk.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- disk.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes.rate_cmaui_1c1
- disk.allocation_server_1b_pd:
- - abstract_pd_server_1b
- - disk.allocation_pd_server_1b
- binding_oam_port_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2_oam_port
- disk.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- disk.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.read.bytes.rate_cmaui_1c1
- host_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- host_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - host_cmaui_1c1
- cpu_server_1b_ps:
- - abstract_ps_server_1b
- - cpu_ps_server_1b
- network.outpoing.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- disk.allocation_server_1b_ps:
- - abstract_ps_server_1b
- - disk.allocation_ps_server_1b
- network.outpoing.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outpoing.packets_cmaui_1c1_cmaui_port
- disk.latency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.latency_oam_server_1c2
- disk.latency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.latency_oam_server_1c2
- disk.read.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.requests_ps_server_1b
- disk.capacity_server_1b_ps:
- - abstract_ps_server_1b
- - disk.capacity_ps_server_1b
- memory.usage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - memory.usage_oam_server_1c2
- network.outpoing.packets_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outpoing.packets_ps_server_1b_ps_server_1b_port
- memory.usage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - memory.usage_oam_server_1c2
- disk.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.read.requests_oam_server_1c2
- attachment_packet_external_network:
- - packet_external_network
- - attachment
- disk.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.read.requests_oam_server_1c2
- disk.usage_server_1b_ps:
- - abstract_ps_server_1b
- - disk.usage_ps_server_1b
- disk.root.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.root.size_oam_server_1c2
- memory.resident_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- disk.root.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.root.size_oam_server_1c2
- memory.resident_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.resident_cmaui_1c1
- network.incoming.bytes.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port
- network.incoming.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- os_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- os_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - os_cmaui_1c1
- instance_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - instance_oam_server_1c2
- instance_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - instance_oam_server_1c2
- network.incoming.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes.rate_oam_server_1c2_oam_port
- vcpus_server_1b_pd:
- - abstract_pd_server_1b
- - vcpus_pd_server_1b
- memory.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- disk.write.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.bytes.rate_ps_server_1b
- memory.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory.usage_cmaui_1c1
- binding_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- memory_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- binding_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - binding_cmaui_1c1
- feature_ps_server_1b_port:
- - abstract_ps_server_1b
- - feature_ps_server_1b_ps_server_1b_port
- disk.device.iops_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.iops_oam_server_1c2
- vcpus_server_1b_ps:
- - abstract_ps_server_1b
- - vcpus_ps_server_1b
- disk.device.iops_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.iops_oam_server_1c2
- disk.write.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.bytes.rate_pd_server_1b
- forwarder_oam_port_1:
- - abstract_oam_server_1c2_0
- - forwarder_oam_server_1c2_oam_port
- forwarder_oam_port_2:
- - abstract_oam_server_1c2_1
- - forwarder_oam_server_1c2_oam_port
- binding_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - binding_oam_server_1c2
- binding_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - binding_oam_server_1c2
- os_server_1b_pd:
- - abstract_pd_server_1b
- - os_pd_server_1b
- attachment_packet_internal_network:
- - packet_internal_network
- - attachment
- network.outgoing.packets.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port
- memory_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - memory_cmaui_1c1
- disk.device.latency_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.latency_pd_server_1b
- disk.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests_oam_server_1c2
- disk.device.usage_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.usage_pd_server_1b
- disk.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests_oam_server_1c2
- vcpus_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - vcpus_oam_server_1c2
- vcpus_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - vcpus_oam_server_1c2
- os_server_1b_ps:
- - abstract_ps_server_1b
- - os_ps_server_1b
- disk.device.latency_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.latency_ps_server_1b
- disk.ephemeral.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.ephemeral.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.ephemeral.size_cmaui_1c1
- disk.root.size_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.device.usage_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.usage_ps_server_1b
- disk.root.size_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.root.size_cmaui_1c1
- disk.read.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.bytes_ps_server_1b
- network.incoming.packets_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- disk.device.write.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.ephemeral.size_server_1b_pd:
- - abstract_pd_server_1b
- - disk.ephemeral.size_pd_server_1b
- disk.device.write.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.requests_oam_server_1c2
- disk.allocation_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- memory_server_1b_ps:
- - abstract_ps_server_1b
- - memory_ps_server_1b
- network.incoming.packets_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.packets_cmaui_1c1_cmaui_port
- network.outgoing.bytes.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port
- network.incoming.packets.rate_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port
- disk.device.write.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- disk.device.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- disk.device.write.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.requests.rate_cmaui_1c1
- feature_server_1b_ps:
- - abstract_ps_server_1b
- - feature_ps_server_1b
- disk.write.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.requests.rate_ps_server_1b
- disk.device.write.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.requests_oam_server_1c2
- disk.device.write.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.write.bytes.rate_cmaui_1c1
- disk.device.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.write.bytes_cmaui_1c1
- host_server_1b_pd:
- - abstract_pd_server_1b
- - host_pd_server_1b
- disk.device.read.requests_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.requests_oam_server_1c2
- disk.ephemeral.size_server_1b_ps:
- - abstract_ps_server_1b
- - disk.ephemeral.size_ps_server_1b
- disk.read.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.bytes_pd_server_1b
- host_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - host_oam_server_1c2
- disk.device.read.requests_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.requests_oam_server_1c2
- memory_server_1b_pd:
- - abstract_pd_server_1b
- - memory_pd_server_1b
- host_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - host_oam_server_1c2
- network.incoming.packets.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- disk.write.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.bytes_ps_server_1b
- network.incoming.packets.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets.rate_oam_server_1c2_oam_port
- end_point_packet_external_network:
- - packet_external_network
- - end_point
- network.outpoing.packets_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outpoing.packets_pd_server_1b_pd_server_1b_port
- feature_server_1b_pd:
- - abstract_pd_server_1b
- - feature_pd_server_1b
- disk.device.read.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- disk.allocation_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.allocation_cmaui_1c1
- disk.device.read.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests_cmaui_1c1
- disk.device.allocation_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.allocation_pd_server_1b
- disk.root.size_server_1b_ps:
- - abstract_ps_server_1b
- - disk.root.size_ps_server_1b
- disk.device.allocation_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.allocation_oam_server_1c2
- disk.device.allocation_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.allocation_oam_server_1c2
- network.outgoing.bytes_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.bytes_pd_server_1b_pd_server_1b_port
- disk.write.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.bytes_pd_server_1b
- disk.write.requests_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- disk.write.requests_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.requests_cmaui_1c1
- disk.device.capacity_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.capacity_pd_server_1b
- network.outgoing.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- disk.root.size_server_1b_pd:
- - abstract_pd_server_1b
- - disk.root.size_pd_server_1b
- cpu_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- network.outgoing.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port
- cpu_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu_cmaui_1c1
- cpu_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu_oam_server_1c2
- disk.device.capacity_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.capacity_ps_server_1b
- disk.write.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.requests.rate_pd_server_1b
- cpu_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu_oam_server_1c2
- link_packet_external_network:
- - packet_external_network
- - link
- disk.device.read.bytes.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- disk.device.read.bytes.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.bytes.rate_cmaui_1c1
- host_server_1b_ps:
- - abstract_ps_server_1b
- - host_ps_server_1b
- disk.write.requests.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.write.requests.rate_oam_server_1c2
- cpu.delta_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - cpu.delta_oam_server_1c2
- disk.iops_server_1b_pd:
- - abstract_pd_server_1b
- - disk.iops_pd_server_1b
- disk.write.requests.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.write.requests.rate_oam_server_1c2
- disk.usage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- disk.usage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.usage_cmaui_1c1
- disk.device.allocation_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.allocation_ps_server_1b
- end_point_packet_internal_network:
- - packet_internal_network
- - end_point
- network.incoming.bytes_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.bytes_oam_server_1c2_oam_port
- feature_packet_internal_network:
- - packet_internal_network
- - feature
- network.incoming.bytes_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.bytes_oam_server_1c2_oam_port
- forwarder_pd_server_1b_port:
- - abstract_pd_server_1b
- - forwarder_pd_server_1b_pd_server_1b_port
- disk.device.write.requests.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.write.requests.rate_ps_server_1b
- attachment_cmaui_port_2:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- network.outgoing.bytes.rate_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- network.outgoing.bytes.rate_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.outgoing.bytes.rate_oam_server_1c2_oam_port
- disk.iops_server_1b_ps:
- - abstract_ps_server_1b
- - disk.iops_ps_server_1b
- disk.capacity_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- network.outgoing.packets.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- network.outgoing.packets.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.outgoing.packets.rate_cmaui_1c1_cmaui_port
- attachment_cmaui_port_1:
- - abstract_cmaui_1c1
- - attachment_cmaui_1c1_cmaui_port
- disk.capacity_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.capacity_cmaui_1c1
- disk.ephemeral.size_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.ephemeral.size_oam_server_1c2
- disk.read.bytes.rate_server_1b_ps:
- - abstract_ps_server_1b
- - disk.read.bytes.rate_ps_server_1b
- disk.ephemeral.size_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.ephemeral.size_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- disk.device.read.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes_oam_server_1c2
- disk.device.read.requests.rate_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.read.requests.rate_cmaui_1c1
- network.incoming.packets_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.incoming.packets_ps_server_1b_ps_server_1b_port
- disk.write.requests_server_1b_ps:
- - abstract_ps_server_1b
- - disk.write.requests_ps_server_1b
- feature_pd_server_1b_port:
- - abstract_pd_server_1b
- - feature_pd_server_1b_pd_server_1b_port
- disk.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- scalable_server_1b_ps:
- - abstract_ps_server_1b
- - scalable_ps_server_1b
- disk.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.latency_cmaui_1c1
- cpu.delta_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - cpu.delta_oam_server_1c2
- disk.device.read.bytes.rate_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.read.bytes.rate_oam_server_1c2
- disk.device.read.bytes.rate_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.read.bytes.rate_oam_server_1c2
- scalable_server_1b_pd:
- - abstract_pd_server_1b
- - scalable_pd_server_1b
- disk.write.requests_server_1b_pd:
- - abstract_pd_server_1b
- - disk.write.requests_pd_server_1b
- disk.latency_server_1b_ps:
- - abstract_ps_server_1b
- - disk.latency_ps_server_1b
- disk.write.bytes_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- network.outgoing.bytes.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port
- disk.write.bytes_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.write.bytes_cmaui_1c1
- feature_oam_port_2:
- - abstract_oam_server_1c2_1
- - feature_oam_server_1c2_oam_port
- feature_oam_port_1:
- - abstract_oam_server_1c2_0
- - feature_oam_server_1c2_oam_port
- network.incoming.packets.rate_pd_server_1b_port:
- - abstract_pd_server_1b
- - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port
- disk.device.latency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- disk.read.bytes.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.read.bytes.rate_pd_server_1b
- scalable_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- link_packet_internal_network:
- - packet_internal_network
- - link
- disk.device.latency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.device.latency_cmaui_1c1
- scalable_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - scalable_cmaui_1c1
- cpu.delta_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- endpoint_server_1b_pd:
- - abstract_pd_server_1b
- - endpoint_pd_server_1b
- cpu.delta_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - cpu.delta_cmaui_1c1
- endpoint_server_1b_ps:
- - abstract_ps_server_1b
- - endpoint_ps_server_1b
- network.incoming.packets_oam_port_1:
- - abstract_oam_server_1c2_0
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.packets_oam_port_2:
- - abstract_oam_server_1c2_1
- - network.incoming.packets_oam_server_1c2_oam_port
- network.incoming.bytes.rate_cmaui_port_1:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- network.outgoing.bytes_ps_server_1b_port:
- - abstract_ps_server_1b
- - network.outgoing.bytes_ps_server_1b_ps_server_1b_port
- network.incoming.bytes.rate_cmaui_port_2:
- - abstract_cmaui_1c1
- - network.incoming.bytes.rate_cmaui_1c1_cmaui_port
- disk.device.read.bytes_server_1b_ps:
- - abstract_ps_server_1b
- - disk.device.read.bytes_ps_server_1b
- disk.iops_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.iops_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - disk.iops_cmaui_1c1
- disk.device.write.requests.rate_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.write.requests.rate_pd_server_1b
- memory.resident_server_1b_pd:
- - abstract_pd_server_1b
- - memory.resident_pd_server_1b
- disk.device.write.bytes_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - disk.device.write.bytes_oam_server_1c2
- disk.device.write.bytes_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - disk.device.write.bytes_oam_server_1c2
- memory.resident_server_1b_ps:
- - abstract_ps_server_1b
- - memory.resident_ps_server_1b
- disk.device.read.bytes_server_1b_pd:
- - abstract_pd_server_1b
- - disk.device.read.bytes_pd_server_1b
- endpoint_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - endpoint_oam_server_1c2
- endpoint_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - endpoint_oam_server_1c2
- requirements:
- dependency_server_1b_pd:
- - abstract_pd_server_1b
- - dependency_pd_server_1b
- link_pd_server_1b_port:
- - abstract_pd_server_1b
- - link_pd_server_1b_pd_server_1b_port
- local_storage_server_1b_ps:
- - abstract_ps_server_1b
- - local_storage_ps_server_1b
- dependency_oam_port_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2_oam_port
- dependency_oam_port_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2_oam_port
- dependency_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- dependency_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1
- link_ps_server_1b_port:
- - abstract_ps_server_1b
- - link_ps_server_1b_ps_server_1b_port
- local_storage_server_1b_pd:
- - abstract_pd_server_1b
- - local_storage_pd_server_1b
- dependency_ps_server_1b_port:
- - abstract_ps_server_1b
- - dependency_ps_server_1b_ps_server_1b_port
- dependency_server_1b_ps:
- - abstract_ps_server_1b
- - dependency_ps_server_1b
- dependency_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - dependency_oam_server_1c2
- dependency_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - dependency_oam_server_1c2
- local_storage_server_1c2_oam_2:
- - abstract_oam_server_1c2_1
- - local_storage_oam_server_1c2
- local_storage_server_1c2_oam_1:
- - abstract_oam_server_1c2_0
- - local_storage_oam_server_1c2
- dependency_pd_server_1b_port:
- - abstract_pd_server_1b
- - dependency_pd_server_1b_pd_server_1b_port
- dependency_cmaui_port_1:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_packet_internal_network:
- - packet_internal_network
- - dependency
- local_storage_server_1c1_cmaui_2:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- local_storage_server_1c1_cmaui_1:
- - abstract_cmaui_1c1
- - local_storage_cmaui_1c1
- dependency_cmaui_port_2:
- - abstract_cmaui_1c1
- - dependency_cmaui_1c1_cmaui_port
- dependency_packet_external_network:
- - packet_external_network
- - dependency
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + immutable: false + type: string + description: UID of OAM network + cmaui_1c1_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + ps_server_1b_ips: + hidden: false + immutable: false + type: string + packet_internal_network_name: + hidden: false + immutable: false + type: string + pd_server_1b_names: + hidden: false + immutable: false + type: list + description: PD server names + entry_schema: + type: string + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + oam_server_1c2_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + cmaui_1c1_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + ps_server_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + cmaui_1c1_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + pd_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + pd_server_1b_ips: + hidden: false + immutable: false + type: string + packet_external_network_name: + hidden: false + immutable: false + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + ps_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PS server + cmaui_oam_ips: + hidden: false + immutable: false + type: string + ps_server_1b_image: + hidden: false + immutable: false + type: string + description: Ps Image server + net: + hidden: false + immutable: false + type: string + pd_server_1b_image: + hidden: false + immutable: false + type: string + description: PD Image server + oam_server_1c2_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + oam_server_1c2_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + node_templates: + abstract_cmaui_1c1: + type: org.openecomp.resource.abstract.nodes.cmaui_1c1 + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - packet_internal_network + - packet_internal_network + compute_cmaui_1c1_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + vm_flavor_name: + get_input: cmaui_1c1_flavor + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_1c1_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + compute_cmaui_1c1_name: + - get_input: + - cmaui_1c1_names + - 1 + - get_input: + - cmaui_1c1_names + - 0 + port_cmaui_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_cmaui_1c1ServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_cmaui_1c1_cmaui_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network + relationship: tosca.relationships.network.LinksTo + abstract_pd_server_1b: + type: org.openecomp.resource.abstract.nodes.pd_server_1b + directives: + - substitutable + properties: + compute_pd_server_1b_name: + - get_input: + - pd_server_1b_names + - 0 + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_replacement_policy: + - AUTO + port_pd_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_pd_server_1b_port_fixed_ips: + - ip_address: + get_input: + - pd_server_1b_ips + - 0 + port_pd_server_1b_port_network: + - get_input: net + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server_1b: + type: org.openecomp.resource.abstract.nodes.ps_server_1b + directives: + - substitutable + properties: + port_ps_server_1b_port_mac_requirements: + mac_count_required: + is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true + port_ps_server_1b_port_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_network: + - get_input: net + port_ps_server_1b_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + vm_image_name: + get_input: ps_server_1b_image + port_ps_server_1b_port_replacement_policy: + - AUTO + compute_ps_server_1b_availability_zone: + - get_input: availability_zone_0 + compute_ps_server_1b_name: + - get_input: + - ps_server_1b_names + - 1 + service_template_filter: + substitute_service_template: Nested_ps_server_1bServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + packet_external_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_external_network_name + packet_internal_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_internal_network_name + abstract_oam_server_1c2_1: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 1 + port_oam_port_network: + - packet_external_network + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_external_network + relationship: tosca.relationships.network.LinksTo + abstract_oam_server_1c2_0: + type: org.openecomp.resource.abstract.nodes.oam_server_1c2 + directives: + - substitutable + properties: + port_oam_port_mac_requirements: + mac_count_required: + is_required: false + compute_oam_server_1c2_name: + - get_input: + - oam_server_1c2_names + - 0 + port_oam_port_network: + - packet_internal_network + vm_flavor_name: + get_input: oam_server_1c2_flavor + compute_oam_server_1c2_availability_zone: + - get_input: availability_zone_0 + port_oam_port_fixed_ips: + - ip_address: + get_input: + - cmaui_oam_ips + - 1 + vm_image_name: + get_input: oam_server_1c2_image + port_oam_port_subinterface_indicator: + - true + port_oam_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_oam_port_replacement_policy: + - AUTO + service_template_filter: + substitute_service_template: Nested_oam_server_1c2ServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_oam_server_1c2_oam_port: + capability: tosca.capabilities.network.Linkable + node: packet_internal_network + relationship: tosca.relationships.network.LinksTo + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: nested1 + members: + - packet_external_network + - packet_internal_network + - abstract_ps_server_1b + - abstract_oam_server_1c2_0 + - abstract_oam_server_1c2_1 + - abstract_pd_server_1b + - abstract_cmaui_1c1 + outputs: + all_pattern_attr_1: + description: all_pattern_attr_1 + value: + get_attribute: + - abstract_oam_server_1c2_1 + - oam_server_1c2_accessIPv4 + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + capabilities: + disk.capacity_server_1b_pd: + - abstract_pd_server_1b + - disk.capacity_pd_server_1b + disk.device.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.device.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.bytes.rate_ps_server_1b + disk.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes_cmaui_1c1 + disk.usage_server_1b_pd: + - abstract_pd_server_1b + - disk.usage_pd_server_1b + disk.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.iops_oam_server_1c2 + disk.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.usage_oam_server_1c2 + disk.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + feature_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + disk.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.usage_oam_server_1c2 + network.incoming.bytes_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port + feature_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1 + disk.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.requests_cmaui_1c1 + disk.device.iops_server_1b_ps: + - abstract_ps_server_1b + - disk.device.iops_ps_server_1b + network.outgoing.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + disk.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.iops_oam_server_1c2 + network.outgoing.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + network.outgoing.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.packets.rate_oam_server_1c2_oam_port + disk.device.iops_server_1b_pd: + - abstract_pd_server_1b + - disk.device.iops_pd_server_1b + network.incoming.packets_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port + attachment_ps_server_1b_port: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests.rate_oam_server_1c2 + forwarder_ps_server_1b_port: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.bytes.rate_pd_server_1b + disk.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes.rate_oam_server_1c2 + disk.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes.rate_oam_server_1c2 + scalable_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - scalable_oam_server_1c2 + disk.latency_server_1b_pd: + - abstract_pd_server_1b + - disk.latency_pd_server_1b + scalable_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - scalable_oam_server_1c2 + disk.device.read.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.requests.rate_pd_server_1b + disk.device.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.read.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes_cmaui_1c1 + disk.device.read.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.requests.rate_ps_server_1b + disk.device.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.usage_oam_server_1c2 + disk.device.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.capacity_oam_server_1c2 + disk.device.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.capacity_oam_server_1c2 + binding_server_1b_ps: + - abstract_ps_server_1b + - binding_ps_server_1b + binding_server_1b_pd: + - abstract_pd_server_1b + - binding_pd_server_1b + disk.device.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.usage_oam_server_1c2 + memory.usage_server_1b_pd: + - abstract_pd_server_1b + - memory.usage_pd_server_1b + network.outpoing.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outpoing.packets_oam_server_1c2_oam_port + network.outpoing.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outpoing.packets_oam_server_1c2_oam_port + binding_cmaui_port_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + binding_cmaui_port_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1_cmaui_port + memory.usage_server_1b_ps: + - abstract_ps_server_1b + - memory.usage_ps_server_1b + cpu_util_server_1b_pd: + - abstract_pd_server_1b + - cpu_util_pd_server_1b + cpu_util_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_util_oam_server_1c2 + cpu_util_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_util_oam_server_1c2 + memory_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory_oam_server_1c2 + memory_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory_oam_server_1c2 + disk.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes_oam_server_1c2 + disk.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes_oam_server_1c2 + memory.resident_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.resident_oam_server_1c2 + memory.resident_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.resident_oam_server_1c2 + cpu_util_server_1b_ps: + - abstract_ps_server_1b + - cpu_util_ps_server_1b + network.incoming.bytes_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + network.incoming.bytes_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes_cmaui_1c1_cmaui_port + os_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - os_oam_server_1c2 + disk.device.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + instance_server_1b_pd: + - abstract_pd_server_1b + - instance_pd_server_1b + disk.device.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.iops_cmaui_1c1 + os_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - os_oam_server_1c2 + disk.device.write.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.bytes_pd_server_1b + disk.device.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + disk.device.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.allocation_cmaui_1c1 + feature_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2 + disk.device.write.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.bytes_ps_server_1b + network.incoming.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + vcpus_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + network.incoming.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets.rate_cmaui_1c1_cmaui_port + feature_cmaui_port_1: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + network.incoming.bytes.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + network.outgoing.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes_oam_server_1c2_oam_port + feature_cmaui_port_2: + - abstract_cmaui_1c1 + - feature_cmaui_1c1_cmaui_port + instance_server_1b_ps: + - abstract_ps_server_1b + - instance_ps_server_1b + feature_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2 + network.outgoing.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes_oam_server_1c2_oam_port + disk.device.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + instance_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + cpu.delta_server_1b_ps: + - abstract_ps_server_1b + - cpu.delta_ps_server_1b + instance_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - instance_cmaui_1c1 + disk.device.read.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests.rate_oam_server_1c2 + disk.device.read.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests.rate_oam_server_1c2 + attachment_oam_port_2: + - abstract_oam_server_1c2_1 + - attachment_oam_server_1c2_oam_port + disk.device.write.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.bytes.rate_pd_server_1b + disk.capacity_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.capacity_oam_server_1c2 + disk.capacity_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.capacity_oam_server_1c2 + cpu.delta_server_1b_pd: + - abstract_pd_server_1b + - cpu.delta_pd_server_1b + attachment_oam_port_1: + - abstract_oam_server_1c2_0 + - attachment_oam_server_1c2_oam_port + disk.device.write.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.requests_pd_server_1b + disk.write.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.bytes.rate_oam_server_1c2 + disk.write.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.bytes.rate_oam_server_1c2 + endpoint_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + network.outgoing.packets.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + endpoint_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - endpoint_cmaui_1c1 + disk.device.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + disk.device.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.capacity_cmaui_1c1 + disk.device.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.usage_cmaui_1c1 + network.incoming.bytes_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port + attachment_pd_server_1b_port: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port + vcpus_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - vcpus_cmaui_1c1 + binding_ps_server_1b_port: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port + disk.device.write.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.bytes.rate_ps_server_1b + forwarder_cmaui_port_2: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui_1c1 + - forwarder_cmaui_1c1_cmaui_port + disk.device.write.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.requests_ps_server_1b + disk.device.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.latency_oam_server_1c2 + disk.device.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.latency_oam_server_1c2 + feature_packet_external_network: + - packet_external_network + - feature + disk.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + disk.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests.rate_cmaui_1c1 + disk.device.read.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.requests_pd_server_1b + disk.read.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.read.requests_pd_server_1b + cpu_util_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + disk.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.allocation_oam_server_1c2 + disk.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.allocation_oam_server_1c2 + cpu_util_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_util_cmaui_1c1 + disk.device.read.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.requests_ps_server_1b + binding_pd_server_1b_port: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port + disk.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.bytes_oam_server_1c2 + disk.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.bytes_oam_server_1c2 + cpu_server_1b_pd: + - abstract_pd_server_1b + - cpu_pd_server_1b + binding_oam_port_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2_oam_port + disk.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + disk.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes.rate_cmaui_1c1 + disk.allocation_server_1b_pd: + - abstract_pd_server_1b + - disk.allocation_pd_server_1b + binding_oam_port_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2_oam_port + disk.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + disk.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.read.bytes.rate_cmaui_1c1 + host_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + host_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - host_cmaui_1c1 + cpu_server_1b_ps: + - abstract_ps_server_1b + - cpu_ps_server_1b + network.outpoing.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + disk.allocation_server_1b_ps: + - abstract_ps_server_1b + - disk.allocation_ps_server_1b + network.outpoing.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outpoing.packets_cmaui_1c1_cmaui_port + disk.latency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.latency_oam_server_1c2 + disk.latency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.latency_oam_server_1c2 + disk.read.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.read.requests_ps_server_1b + disk.capacity_server_1b_ps: + - abstract_ps_server_1b + - disk.capacity_ps_server_1b + memory.usage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - memory.usage_oam_server_1c2 + network.outpoing.packets_ps_server_1b_port: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port + memory.usage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - memory.usage_oam_server_1c2 + disk.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.read.requests_oam_server_1c2 + attachment_packet_external_network: + - packet_external_network + - attachment + disk.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.read.requests_oam_server_1c2 + disk.usage_server_1b_ps: + - abstract_ps_server_1b + - disk.usage_ps_server_1b + disk.root.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.root.size_oam_server_1c2 + memory.resident_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + disk.root.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.root.size_oam_server_1c2 + memory.resident_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.resident_cmaui_1c1 + network.incoming.bytes.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + network.incoming.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + os_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + os_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - os_cmaui_1c1 + instance_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - instance_oam_server_1c2 + instance_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - instance_oam_server_1c2 + network.incoming.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes.rate_oam_server_1c2_oam_port + vcpus_server_1b_pd: + - abstract_pd_server_1b + - vcpus_pd_server_1b + memory.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + disk.write.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.write.bytes.rate_ps_server_1b + memory.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory.usage_cmaui_1c1 + binding_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + memory_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + binding_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - binding_cmaui_1c1 + feature_ps_server_1b_port: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port + disk.device.iops_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.iops_oam_server_1c2 + vcpus_server_1b_ps: + - abstract_ps_server_1b + - vcpus_ps_server_1b + disk.device.iops_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.iops_oam_server_1c2 + disk.write.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.write.bytes.rate_pd_server_1b + forwarder_oam_port_1: + - abstract_oam_server_1c2_0 + - forwarder_oam_server_1c2_oam_port + forwarder_oam_port_2: + - abstract_oam_server_1c2_1 + - forwarder_oam_server_1c2_oam_port + binding_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - binding_oam_server_1c2 + binding_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - binding_oam_server_1c2 + os_server_1b_pd: + - abstract_pd_server_1b + - os_pd_server_1b + attachment_packet_internal_network: + - packet_internal_network + - attachment + network.outgoing.packets.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + memory_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - memory_cmaui_1c1 + disk.device.latency_server_1b_pd: + - abstract_pd_server_1b + - disk.device.latency_pd_server_1b + disk.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests_oam_server_1c2 + disk.device.usage_server_1b_pd: + - abstract_pd_server_1b + - disk.device.usage_pd_server_1b + disk.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests_oam_server_1c2 + vcpus_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - vcpus_oam_server_1c2 + vcpus_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - vcpus_oam_server_1c2 + os_server_1b_ps: + - abstract_ps_server_1b + - os_ps_server_1b + disk.device.latency_server_1b_ps: + - abstract_ps_server_1b + - disk.device.latency_ps_server_1b + disk.ephemeral.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.ephemeral.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.ephemeral.size_cmaui_1c1 + disk.root.size_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.device.usage_server_1b_ps: + - abstract_ps_server_1b + - disk.device.usage_ps_server_1b + disk.root.size_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.root.size_cmaui_1c1 + disk.read.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.read.bytes_ps_server_1b + network.incoming.packets_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + disk.device.write.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.ephemeral.size_server_1b_pd: + - abstract_pd_server_1b + - disk.ephemeral.size_pd_server_1b + disk.device.write.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.requests_oam_server_1c2 + disk.allocation_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + memory_server_1b_ps: + - abstract_ps_server_1b + - memory_ps_server_1b + network.incoming.packets_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.packets_cmaui_1c1_cmaui_port + network.outgoing.bytes.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + network.incoming.packets.rate_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + disk.device.write.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + disk.device.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + disk.device.write.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.requests.rate_cmaui_1c1 + feature_server_1b_ps: + - abstract_ps_server_1b + - feature_ps_server_1b + disk.write.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.write.requests.rate_ps_server_1b + disk.device.write.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.requests_oam_server_1c2 + disk.device.write.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.write.bytes.rate_cmaui_1c1 + disk.device.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.write.bytes_cmaui_1c1 + host_server_1b_pd: + - abstract_pd_server_1b + - host_pd_server_1b + disk.device.read.requests_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.requests_oam_server_1c2 + disk.ephemeral.size_server_1b_ps: + - abstract_ps_server_1b + - disk.ephemeral.size_ps_server_1b + disk.read.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.read.bytes_pd_server_1b + host_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - host_oam_server_1c2 + disk.device.read.requests_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.requests_oam_server_1c2 + memory_server_1b_pd: + - abstract_pd_server_1b + - memory_pd_server_1b + host_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - host_oam_server_1c2 + network.incoming.packets.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets.rate_oam_server_1c2_oam_port + disk.write.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.write.bytes_ps_server_1b + network.incoming.packets.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets.rate_oam_server_1c2_oam_port + end_point_packet_external_network: + - packet_external_network + - end_point + network.outpoing.packets_pd_server_1b_port: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port + feature_server_1b_pd: + - abstract_pd_server_1b + - feature_pd_server_1b + disk.device.read.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + disk.allocation_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.allocation_cmaui_1c1 + disk.device.read.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests_cmaui_1c1 + disk.device.allocation_server_1b_pd: + - abstract_pd_server_1b + - disk.device.allocation_pd_server_1b + disk.root.size_server_1b_ps: + - abstract_ps_server_1b + - disk.root.size_ps_server_1b + disk.device.allocation_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.allocation_oam_server_1c2 + disk.device.allocation_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.allocation_oam_server_1c2 + network.outgoing.bytes_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + disk.write.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.write.bytes_pd_server_1b + disk.write.requests_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + disk.write.requests_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.requests_cmaui_1c1 + disk.device.capacity_server_1b_pd: + - abstract_pd_server_1b + - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + disk.root.size_server_1b_pd: + - abstract_pd_server_1b + - disk.root.size_pd_server_1b + cpu_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + network.outgoing.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.bytes.rate_cmaui_1c1_cmaui_port + cpu_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu_cmaui_1c1 + cpu_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu_oam_server_1c2 + disk.device.capacity_server_1b_ps: + - abstract_ps_server_1b + - disk.device.capacity_ps_server_1b + disk.write.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.write.requests.rate_pd_server_1b + cpu_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu_oam_server_1c2 + link_packet_external_network: + - packet_external_network + - link + disk.device.read.bytes.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + disk.device.read.bytes.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.bytes.rate_cmaui_1c1 + host_server_1b_ps: + - abstract_ps_server_1b + - host_ps_server_1b + disk.write.requests.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.write.requests.rate_oam_server_1c2 + cpu.delta_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - cpu.delta_oam_server_1c2 + disk.iops_server_1b_pd: + - abstract_pd_server_1b + - disk.iops_pd_server_1b + disk.write.requests.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.write.requests.rate_oam_server_1c2 + disk.usage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + disk.usage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.usage_cmaui_1c1 + disk.device.allocation_server_1b_ps: + - abstract_ps_server_1b + - disk.device.allocation_ps_server_1b + end_point_packet_internal_network: + - packet_internal_network + - end_point + network.incoming.bytes_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.bytes_oam_server_1c2_oam_port + feature_packet_internal_network: + - packet_internal_network + - feature + network.incoming.bytes_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.bytes_oam_server_1c2_oam_port + forwarder_pd_server_1b_port: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port + disk.device.write.requests.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.device.write.requests.rate_ps_server_1b + attachment_cmaui_port_2: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + network.outgoing.bytes.rate_oam_port_1: + - abstract_oam_server_1c2_0 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + network.outgoing.bytes.rate_oam_port_2: + - abstract_oam_server_1c2_1 + - network.outgoing.bytes.rate_oam_server_1c2_oam_port + disk.iops_server_1b_ps: + - abstract_ps_server_1b + - disk.iops_ps_server_1b + disk.capacity_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + network.outgoing.packets.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + network.outgoing.packets.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.outgoing.packets.rate_cmaui_1c1_cmaui_port + attachment_cmaui_port_1: + - abstract_cmaui_1c1 + - attachment_cmaui_1c1_cmaui_port + disk.capacity_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.capacity_cmaui_1c1 + disk.ephemeral.size_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.ephemeral.size_oam_server_1c2 + disk.read.bytes.rate_server_1b_ps: + - abstract_ps_server_1b + - disk.read.bytes.rate_ps_server_1b + disk.ephemeral.size_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.ephemeral.size_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + disk.device.read.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes_oam_server_1c2 + disk.device.read.requests.rate_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.read.requests.rate_cmaui_1c1 + network.incoming.packets_ps_server_1b_port: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port + disk.write.requests_server_1b_ps: + - abstract_ps_server_1b + - disk.write.requests_ps_server_1b + feature_pd_server_1b_port: + - abstract_pd_server_1b + - feature_pd_server_1b_pd_server_1b_port + disk.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + scalable_server_1b_ps: + - abstract_ps_server_1b + - scalable_ps_server_1b + disk.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.latency_cmaui_1c1 + cpu.delta_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - cpu.delta_oam_server_1c2 + disk.device.read.bytes.rate_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.read.bytes.rate_oam_server_1c2 + disk.device.read.bytes.rate_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.read.bytes.rate_oam_server_1c2 + scalable_server_1b_pd: + - abstract_pd_server_1b + - scalable_pd_server_1b + disk.write.requests_server_1b_pd: + - abstract_pd_server_1b + - disk.write.requests_pd_server_1b + disk.latency_server_1b_ps: + - abstract_ps_server_1b + - disk.latency_ps_server_1b + disk.write.bytes_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + network.outgoing.bytes.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + disk.write.bytes_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.write.bytes_cmaui_1c1 + feature_oam_port_2: + - abstract_oam_server_1c2_1 + - feature_oam_server_1c2_oam_port + feature_oam_port_1: + - abstract_oam_server_1c2_0 + - feature_oam_server_1c2_oam_port + network.incoming.packets.rate_pd_server_1b_port: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + disk.device.latency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + disk.read.bytes.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.read.bytes.rate_pd_server_1b + scalable_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + link_packet_internal_network: + - packet_internal_network + - link + disk.device.latency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.device.latency_cmaui_1c1 + scalable_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - scalable_cmaui_1c1 + cpu.delta_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + endpoint_server_1b_pd: + - abstract_pd_server_1b + - endpoint_pd_server_1b + cpu.delta_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - cpu.delta_cmaui_1c1 + endpoint_server_1b_ps: + - abstract_ps_server_1b + - endpoint_ps_server_1b + network.incoming.packets_oam_port_1: + - abstract_oam_server_1c2_0 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.packets_oam_port_2: + - abstract_oam_server_1c2_1 + - network.incoming.packets_oam_server_1c2_oam_port + network.incoming.bytes.rate_cmaui_port_1: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + network.outgoing.bytes_ps_server_1b_port: + - abstract_ps_server_1b + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + network.incoming.bytes.rate_cmaui_port_2: + - abstract_cmaui_1c1 + - network.incoming.bytes.rate_cmaui_1c1_cmaui_port + disk.device.read.bytes_server_1b_ps: + - abstract_ps_server_1b + - disk.device.read.bytes_ps_server_1b + disk.iops_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.iops_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - disk.iops_cmaui_1c1 + disk.device.write.requests.rate_server_1b_pd: + - abstract_pd_server_1b + - disk.device.write.requests.rate_pd_server_1b + memory.resident_server_1b_pd: + - abstract_pd_server_1b + - memory.resident_pd_server_1b + disk.device.write.bytes_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - disk.device.write.bytes_oam_server_1c2 + disk.device.write.bytes_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - disk.device.write.bytes_oam_server_1c2 + memory.resident_server_1b_ps: + - abstract_ps_server_1b + - memory.resident_ps_server_1b + disk.device.read.bytes_server_1b_pd: + - abstract_pd_server_1b + - disk.device.read.bytes_pd_server_1b + endpoint_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - endpoint_oam_server_1c2 + endpoint_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - endpoint_oam_server_1c2 + requirements: + dependency_server_1b_pd: + - abstract_pd_server_1b + - dependency_pd_server_1b + link_pd_server_1b_port: + - abstract_pd_server_1b + - link_pd_server_1b_pd_server_1b_port + local_storage_server_1b_ps: + - abstract_ps_server_1b + - local_storage_ps_server_1b + dependency_oam_port_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2_oam_port + dependency_oam_port_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2_oam_port + dependency_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + dependency_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1 + link_ps_server_1b_port: + - abstract_ps_server_1b + - link_ps_server_1b_ps_server_1b_port + local_storage_server_1b_pd: + - abstract_pd_server_1b + - local_storage_pd_server_1b + dependency_ps_server_1b_port: + - abstract_ps_server_1b + - dependency_ps_server_1b_ps_server_1b_port + dependency_server_1b_ps: + - abstract_ps_server_1b + - dependency_ps_server_1b + dependency_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - dependency_oam_server_1c2 + dependency_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - dependency_oam_server_1c2 + local_storage_server_1c2_oam_2: + - abstract_oam_server_1c2_1 + - local_storage_oam_server_1c2 + local_storage_server_1c2_oam_1: + - abstract_oam_server_1c2_0 + - local_storage_oam_server_1c2 + dependency_pd_server_1b_port: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port + dependency_cmaui_port_1: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_packet_internal_network: + - packet_internal_network + - dependency + local_storage_server_1c1_cmaui_2: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + local_storage_server_1c1_cmaui_1: + - abstract_cmaui_1c1 + - local_storage_cmaui_1c1 + dependency_cmaui_port_2: + - abstract_cmaui_1c1 + - dependency_cmaui_1c1_cmaui_port + dependency_packet_external_network: + - packet_external_network + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index d11c757e97..0d08845ac3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,6 +86,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -283,6 +289,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -753,6 +760,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -760,6 +768,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index eb78053558..9786d07c75 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 94011d2478..1edc6ac481 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -108,6 +108,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_cmaui_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -159,6 +161,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_cmaui_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7e0913eecb..cc3485bf5c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -197,6 +197,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -204,6 +205,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5c7b91680c..8d6eae184e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,6 +86,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -283,6 +289,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -733,6 +740,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -740,6 +748,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index eb78053558..9786d07c75 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_subnetpoolid: type: string required: true @@ -81,30 +86,34 @@ topology_template: cmaui_cmaui_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_cmaui_port_exCP_naming replacement_policy: get_input: - port_cmaui_port_replacement_policy - index_value + mac_requirements: + get_input: port_cmaui_port_mac_requirements + order: + get_input: port_cmaui_port_order + exCP_naming: + get_input: port_cmaui_port_exCP_naming vlan_requirements: get_input: port_cmaui_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_ip_requirements network_role_tag: get_input: port_cmaui_port_network_role_tag - mac_requirements: - get_input: port_cmaui_port_mac_requirements - order: - get_input: port_cmaui_port_order network_role: get_input: port_cmaui_port_network_role - subnetpoolid: - get_input: port_cmaui_port_subnetpoolid fixed_ips: get_input: - port_cmaui_port_fixed_ips - index_value + subnetpoolid: + get_input: port_cmaui_port_subnetpoolid network: get_input: - port_cmaui_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml index 22e2e833c7..09d30ff5ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml @@ -1,479 +1,482 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- cmaui_names:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- p2:
- hidden: false
- immutable: false
- type: string
- description: UID of OAM network
- cmaui_image:
- hidden: false
- immutable: false
- type: string
- description: Image for CMAUI server
- cmaui_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for CMAUI server
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- availability_zone_0:
- label: availabilityzone name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone name
- cmaui_oam_ips:
- hidden: false
- immutable: false
- type: string
- net:
- hidden: false
- immutable: false
- type: string
- node_templates:
- abstract_cmaui:
- type: org.openecomp.resource.abstract.nodes.cmaui
- directives:
- - substitutable
- properties:
- port_cmaui_port_fixed_ips:
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- - - ip_address:
- get_input:
- - cmaui_oam_ips
- - 0
- port_cmaui_port_network:
- - get_input: net
- - get_input: net
- vm_flavor_name:
- get_input: cmaui_flavor
- compute_cmaui_name:
- - get_input:
- - cmaui_names
- - 1
- - get_input:
- - cmaui_names
- - 0
- port_cmaui_port_mac_requirements:
- mac_count_required:
- is_required: false
- compute_cmaui_availability_zone:
- - get_input: availability_zone_0
- - get_input: availability_zone_0
- port_cmaui_port_replacement_policy:
- - AUTO
- - AUTO
- vm_image_name:
- get_input: cmaui_image
- port_cmaui_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: true
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_cmauiServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- nested1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested1.yml
- description: nested1
- members:
- - abstract_cmaui
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested1
- capabilities:
- disk.device.usage_server_cmaui_1:
- - abstract_cmaui
- - disk.device.usage_cmaui
- disk.device.usage_server_cmaui_2:
- - abstract_cmaui
- - disk.device.usage_cmaui
- disk.device.latency_server_cmaui_1:
- - abstract_cmaui
- - disk.device.latency_cmaui
- disk.device.latency_server_cmaui_2:
- - abstract_cmaui
- - disk.device.latency_cmaui
- disk.root.size_server_cmaui_2:
- - abstract_cmaui
- - disk.root.size_cmaui
- disk.device.write.requests.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.device.write.requests.rate_cmaui
- disk.root.size_server_cmaui_1:
- - abstract_cmaui
- - disk.root.size_cmaui
- disk.device.write.requests.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.device.write.requests.rate_cmaui
- disk.read.requests_server_cmaui_2:
- - abstract_cmaui
- - disk.read.requests_cmaui
- network.outgoing.bytes_cmaui_port_2:
- - abstract_cmaui
- - network.outgoing.bytes_cmaui_cmaui_port
- disk.read.requests_server_cmaui_1:
- - abstract_cmaui
- - disk.read.requests_cmaui
- network.outgoing.bytes_cmaui_port_1:
- - abstract_cmaui
- - network.outgoing.bytes_cmaui_cmaui_port
- disk.device.iops_server_cmaui_1:
- - abstract_cmaui
- - disk.device.iops_cmaui
- disk.device.iops_server_cmaui_2:
- - abstract_cmaui
- - disk.device.iops_cmaui
- disk.device.capacity_server_cmaui_2:
- - abstract_cmaui
- - disk.device.capacity_cmaui
- disk.device.read.bytes.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.device.read.bytes.rate_cmaui
- disk.device.read.bytes.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.device.read.bytes.rate_cmaui
- disk.read.bytes_server_cmaui_2:
- - abstract_cmaui
- - disk.read.bytes_cmaui
- disk.read.bytes_server_cmaui_1:
- - abstract_cmaui
- - disk.read.bytes_cmaui
- disk.device.read.bytes_server_cmaui_1:
- - abstract_cmaui
- - disk.device.read.bytes_cmaui
- disk.device.read.bytes_server_cmaui_2:
- - abstract_cmaui
- - disk.device.read.bytes_cmaui
- disk.write.requests.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.write.requests.rate_cmaui
- disk.write.requests.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.write.requests.rate_cmaui
- memory_server_cmaui_2:
- - abstract_cmaui
- - memory_cmaui
- cpu_server_cmaui_2:
- - abstract_cmaui
- - cpu_cmaui
- cpu_server_cmaui_1:
- - abstract_cmaui
- - cpu_cmaui
- network.incoming.packets_cmaui_port_2:
- - abstract_cmaui
- - network.incoming.packets_cmaui_cmaui_port
- network.incoming.packets_cmaui_port_1:
- - abstract_cmaui
- - network.incoming.packets_cmaui_cmaui_port
- disk.ephemeral.size_server_cmaui_1:
- - abstract_cmaui
- - disk.ephemeral.size_cmaui
- disk.ephemeral.size_server_cmaui_2:
- - abstract_cmaui
- - disk.ephemeral.size_cmaui
- disk.capacity_server_cmaui_1:
- - abstract_cmaui
- - disk.capacity_cmaui
- disk.capacity_server_cmaui_2:
- - abstract_cmaui
- - disk.capacity_cmaui
- binding_cmaui_port_1:
- - abstract_cmaui
- - binding_cmaui_cmaui_port
- binding_cmaui_port_2:
- - abstract_cmaui
- - binding_cmaui_cmaui_port
- disk.iops_server_cmaui_2:
- - abstract_cmaui
- - disk.iops_cmaui
- disk.iops_server_cmaui_1:
- - abstract_cmaui
- - disk.iops_cmaui
- disk.device.write.requests_server_cmaui_2:
- - abstract_cmaui
- - disk.device.write.requests_cmaui
- disk.device.write.requests_server_cmaui_1:
- - abstract_cmaui
- - disk.device.write.requests_cmaui
- network.outgoing.bytes.rate_cmaui_port_2:
- - abstract_cmaui
- - network.outgoing.bytes.rate_cmaui_cmaui_port
- disk.device.write.bytes.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.device.write.bytes.rate_cmaui
- cpu_util_server_cmaui_1:
- - abstract_cmaui
- - cpu_util_cmaui
- network.outgoing.bytes.rate_cmaui_port_1:
- - abstract_cmaui
- - network.outgoing.bytes.rate_cmaui_cmaui_port
- network.incoming.bytes_cmaui_port_2:
- - abstract_cmaui
- - network.incoming.bytes_cmaui_cmaui_port
- cpu_util_server_cmaui_2:
- - abstract_cmaui
- - cpu_util_cmaui
- network.incoming.bytes_cmaui_port_1:
- - abstract_cmaui
- - network.incoming.bytes_cmaui_cmaui_port
- disk.device.write.bytes.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.device.write.bytes.rate_cmaui
- disk.write.bytes.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.write.bytes.rate_cmaui
- disk.device.write.bytes_server_cmaui_2:
- - abstract_cmaui
- - disk.device.write.bytes_cmaui
- disk.write.bytes.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.write.bytes.rate_cmaui
- disk.device.write.bytes_server_cmaui_1:
- - abstract_cmaui
- - disk.device.write.bytes_cmaui
- network.incoming.packets.rate_cmaui_port_1:
- - abstract_cmaui
- - network.incoming.packets.rate_cmaui_cmaui_port
- network.incoming.packets.rate_cmaui_port_2:
- - abstract_cmaui
- - network.incoming.packets.rate_cmaui_cmaui_port
- feature_cmaui_port_1:
- - abstract_cmaui
- - feature_cmaui_cmaui_port
- feature_cmaui_port_2:
- - abstract_cmaui
- - feature_cmaui_cmaui_port
- disk.write.bytes_server_cmaui_1:
- - abstract_cmaui
- - disk.write.bytes_cmaui
- disk.write.bytes_server_cmaui_2:
- - abstract_cmaui
- - disk.write.bytes_cmaui
- feature_server_cmaui_1:
- - abstract_cmaui
- - feature_cmaui
- disk.allocation_server_cmaui_1:
- - abstract_cmaui
- - disk.allocation_cmaui
- feature_server_cmaui_2:
- - abstract_cmaui
- - feature_cmaui
- disk.allocation_server_cmaui_2:
- - abstract_cmaui
- - disk.allocation_cmaui
- binding_server_cmaui_1:
- - abstract_cmaui
- - binding_cmaui
- binding_server_cmaui_2:
- - abstract_cmaui
- - binding_cmaui
- vcpus_server_cmaui_2:
- - abstract_cmaui
- - vcpus_cmaui
- attachment_cmaui_port_2:
- - abstract_cmaui
- - attachment_cmaui_cmaui_port
- scalable_server_cmaui_2:
- - abstract_cmaui
- - scalable_cmaui
- scalable_server_cmaui_1:
- - abstract_cmaui
- - scalable_cmaui
- network.outgoing.packets.rate_cmaui_port_1:
- - abstract_cmaui
- - network.outgoing.packets.rate_cmaui_cmaui_port
- network.outgoing.packets.rate_cmaui_port_2:
- - abstract_cmaui
- - network.outgoing.packets.rate_cmaui_cmaui_port
- attachment_cmaui_port_1:
- - abstract_cmaui
- - attachment_cmaui_cmaui_port
- disk.write.requests_server_cmaui_2:
- - abstract_cmaui
- - disk.write.requests_cmaui
- disk.write.requests_server_cmaui_1:
- - abstract_cmaui
- - disk.write.requests_cmaui
- disk.usage_server_cmaui_1:
- - abstract_cmaui
- - disk.usage_cmaui
- disk.usage_server_cmaui_2:
- - abstract_cmaui
- - disk.usage_cmaui
- endpoint_server_cmaui_1:
- - abstract_cmaui
- - endpoint_cmaui
- endpoint_server_cmaui_2:
- - abstract_cmaui
- - endpoint_cmaui
- os_server_cmaui_2:
- - abstract_cmaui
- - os_cmaui
- os_server_cmaui_1:
- - abstract_cmaui
- - os_cmaui
- forwarder_cmaui_port_2:
- - abstract_cmaui
- - forwarder_cmaui_cmaui_port
- forwarder_cmaui_port_1:
- - abstract_cmaui
- - forwarder_cmaui_cmaui_port
- disk.device.allocation_server_cmaui_1:
- - abstract_cmaui
- - disk.device.allocation_cmaui
- disk.device.allocation_server_cmaui_2:
- - abstract_cmaui
- - disk.device.allocation_cmaui
- memory_server_cmaui_1:
- - abstract_cmaui
- - memory_cmaui
- host_server_cmaui_2:
- - abstract_cmaui
- - host_cmaui
- host_server_cmaui_1:
- - abstract_cmaui
- - host_cmaui
- instance_server_cmaui_2:
- - abstract_cmaui
- - instance_cmaui
- disk.device.capacity_server_cmaui_1:
- - abstract_cmaui
- - disk.device.capacity_cmaui
- instance_server_cmaui_1:
- - abstract_cmaui
- - instance_cmaui
- disk.device.read.requests.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.device.read.requests.rate_cmaui
- network.incoming.bytes.rate_cmaui_port_1:
- - abstract_cmaui
- - network.incoming.bytes.rate_cmaui_cmaui_port
- network.incoming.bytes.rate_cmaui_port_2:
- - abstract_cmaui
- - network.incoming.bytes.rate_cmaui_cmaui_port
- vcpus_server_cmaui_1:
- - abstract_cmaui
- - vcpus_cmaui
- disk.device.read.requests_server_cmaui_2:
- - abstract_cmaui
- - disk.device.read.requests_cmaui
- disk.read.bytes.rate_server_cmaui_1:
- - abstract_cmaui
- - disk.read.bytes.rate_cmaui
- network.outpoing.packets_cmaui_port_1:
- - abstract_cmaui
- - network.outpoing.packets_cmaui_cmaui_port
- disk.read.bytes.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.read.bytes.rate_cmaui
- network.outpoing.packets_cmaui_port_2:
- - abstract_cmaui
- - network.outpoing.packets_cmaui_cmaui_port
- disk.device.read.requests_server_cmaui_1:
- - abstract_cmaui
- - disk.device.read.requests_cmaui
- cpu.delta_server_cmaui_1:
- - abstract_cmaui
- - cpu.delta_cmaui
- cpu.delta_server_cmaui_2:
- - abstract_cmaui
- - cpu.delta_cmaui
- disk.device.read.requests.rate_server_cmaui_2:
- - abstract_cmaui
- - disk.device.read.requests.rate_cmaui
- memory.resident_server_cmaui_2:
- - abstract_cmaui
- - memory.resident_cmaui
- memory.resident_server_cmaui_1:
- - abstract_cmaui
- - memory.resident_cmaui
- disk.latency_server_cmaui_2:
- - abstract_cmaui
- - disk.latency_cmaui
- disk.latency_server_cmaui_1:
- - abstract_cmaui
- - disk.latency_cmaui
- memory.usage_server_cmaui_1:
- - abstract_cmaui
- - memory.usage_cmaui
- memory.usage_server_cmaui_2:
- - abstract_cmaui
- - memory.usage_cmaui
- requirements:
- dependency_cmaui_port_1:
- - abstract_cmaui
- - dependency_cmaui_cmaui_port
- local_storage_server_cmaui_2:
- - abstract_cmaui
- - local_storage_cmaui
- link_cmaui_port_2:
- - abstract_cmaui
- - link_cmaui_cmaui_port
- dependency_server_cmaui_2:
- - abstract_cmaui
- - dependency_cmaui
- link_cmaui_port_1:
- - abstract_cmaui
- - link_cmaui_cmaui_port
- dependency_server_cmaui_1:
- - abstract_cmaui
- - dependency_cmaui
- dependency_cmaui_port_2:
- - abstract_cmaui
- - dependency_cmaui_cmaui_port
- local_storage_server_cmaui_1:
- - abstract_cmaui
- - local_storage_cmaui
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + cmaui_names: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + p1: + hidden: false + immutable: false + type: string + description: UID of OAM network + p2: + hidden: false + immutable: false + type: string + description: UID of OAM network + cmaui_image: + hidden: false + immutable: false + type: string + description: Image for CMAUI server + cmaui_flavor: + hidden: false + immutable: false + type: string + description: Flavor for CMAUI server + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + availability_zone_0: + label: availabilityzone name + hidden: false + immutable: false + type: string + description: availabilityzone name + cmaui_oam_ips: + hidden: false + immutable: false + type: string + net: + hidden: false + immutable: false + type: string + node_templates: + abstract_cmaui: + type: org.openecomp.resource.abstract.nodes.cmaui + directives: + - substitutable + properties: + port_cmaui_port_fixed_ips: + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + - - ip_address: + get_input: + - cmaui_oam_ips + - 0 + port_cmaui_port_network: + - get_input: net + - get_input: net + vm_flavor_name: + get_input: cmaui_flavor + compute_cmaui_name: + - get_input: + - cmaui_names + - 1 + - get_input: + - cmaui_names + - 0 + port_cmaui_port_mac_requirements: + mac_count_required: + is_required: false + compute_cmaui_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + port_cmaui_port_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: cmaui_image + port_cmaui_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_cmaui_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_cmauiServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + nested1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested1.yml + description: nested1 + members: + - abstract_cmaui + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested1 + capabilities: + disk.device.usage_server_cmaui_1: + - abstract_cmaui + - disk.device.usage_cmaui + disk.device.usage_server_cmaui_2: + - abstract_cmaui + - disk.device.usage_cmaui + disk.device.latency_server_cmaui_1: + - abstract_cmaui + - disk.device.latency_cmaui + disk.device.latency_server_cmaui_2: + - abstract_cmaui + - disk.device.latency_cmaui + disk.root.size_server_cmaui_2: + - abstract_cmaui + - disk.root.size_cmaui + disk.device.write.requests.rate_server_cmaui_2: + - abstract_cmaui + - disk.device.write.requests.rate_cmaui + disk.root.size_server_cmaui_1: + - abstract_cmaui + - disk.root.size_cmaui + disk.device.write.requests.rate_server_cmaui_1: + - abstract_cmaui + - disk.device.write.requests.rate_cmaui + disk.read.requests_server_cmaui_2: + - abstract_cmaui + - disk.read.requests_cmaui + network.outgoing.bytes_cmaui_port_2: + - abstract_cmaui + - network.outgoing.bytes_cmaui_cmaui_port + disk.read.requests_server_cmaui_1: + - abstract_cmaui + - disk.read.requests_cmaui + network.outgoing.bytes_cmaui_port_1: + - abstract_cmaui + - network.outgoing.bytes_cmaui_cmaui_port + disk.device.iops_server_cmaui_1: + - abstract_cmaui + - disk.device.iops_cmaui + disk.device.iops_server_cmaui_2: + - abstract_cmaui + - disk.device.iops_cmaui + disk.device.capacity_server_cmaui_2: + - abstract_cmaui + - disk.device.capacity_cmaui + disk.device.read.bytes.rate_server_cmaui_2: + - abstract_cmaui + - disk.device.read.bytes.rate_cmaui + disk.device.read.bytes.rate_server_cmaui_1: + - abstract_cmaui + - disk.device.read.bytes.rate_cmaui + disk.read.bytes_server_cmaui_2: + - abstract_cmaui + - disk.read.bytes_cmaui + disk.read.bytes_server_cmaui_1: + - abstract_cmaui + - disk.read.bytes_cmaui + disk.device.read.bytes_server_cmaui_1: + - abstract_cmaui + - disk.device.read.bytes_cmaui + disk.device.read.bytes_server_cmaui_2: + - abstract_cmaui + - disk.device.read.bytes_cmaui + disk.write.requests.rate_server_cmaui_1: + - abstract_cmaui + - disk.write.requests.rate_cmaui + disk.write.requests.rate_server_cmaui_2: + - abstract_cmaui + - disk.write.requests.rate_cmaui + memory_server_cmaui_2: + - abstract_cmaui + - memory_cmaui + cpu_server_cmaui_2: + - abstract_cmaui + - cpu_cmaui + cpu_server_cmaui_1: + - abstract_cmaui + - cpu_cmaui + network.incoming.packets_cmaui_port_2: + - abstract_cmaui + - network.incoming.packets_cmaui_cmaui_port + network.incoming.packets_cmaui_port_1: + - abstract_cmaui + - network.incoming.packets_cmaui_cmaui_port + disk.ephemeral.size_server_cmaui_1: + - abstract_cmaui + - disk.ephemeral.size_cmaui + disk.ephemeral.size_server_cmaui_2: + - abstract_cmaui + - disk.ephemeral.size_cmaui + disk.capacity_server_cmaui_1: + - abstract_cmaui + - disk.capacity_cmaui + disk.capacity_server_cmaui_2: + - abstract_cmaui + - disk.capacity_cmaui + binding_cmaui_port_1: + - abstract_cmaui + - binding_cmaui_cmaui_port + binding_cmaui_port_2: + - abstract_cmaui + - binding_cmaui_cmaui_port + disk.iops_server_cmaui_2: + - abstract_cmaui + - disk.iops_cmaui + disk.iops_server_cmaui_1: + - abstract_cmaui + - disk.iops_cmaui + disk.device.write.requests_server_cmaui_2: + - abstract_cmaui + - disk.device.write.requests_cmaui + disk.device.write.requests_server_cmaui_1: + - abstract_cmaui + - disk.device.write.requests_cmaui + network.outgoing.bytes.rate_cmaui_port_2: + - abstract_cmaui + - network.outgoing.bytes.rate_cmaui_cmaui_port + disk.device.write.bytes.rate_server_cmaui_1: + - abstract_cmaui + - disk.device.write.bytes.rate_cmaui + cpu_util_server_cmaui_1: + - abstract_cmaui + - cpu_util_cmaui + network.outgoing.bytes.rate_cmaui_port_1: + - abstract_cmaui + - network.outgoing.bytes.rate_cmaui_cmaui_port + network.incoming.bytes_cmaui_port_2: + - abstract_cmaui + - network.incoming.bytes_cmaui_cmaui_port + cpu_util_server_cmaui_2: + - abstract_cmaui + - cpu_util_cmaui + network.incoming.bytes_cmaui_port_1: + - abstract_cmaui + - network.incoming.bytes_cmaui_cmaui_port + disk.device.write.bytes.rate_server_cmaui_2: + - abstract_cmaui + - disk.device.write.bytes.rate_cmaui + disk.write.bytes.rate_server_cmaui_2: + - abstract_cmaui + - disk.write.bytes.rate_cmaui + disk.device.write.bytes_server_cmaui_2: + - abstract_cmaui + - disk.device.write.bytes_cmaui + disk.write.bytes.rate_server_cmaui_1: + - abstract_cmaui + - disk.write.bytes.rate_cmaui + disk.device.write.bytes_server_cmaui_1: + - abstract_cmaui + - disk.device.write.bytes_cmaui + network.incoming.packets.rate_cmaui_port_1: + - abstract_cmaui + - network.incoming.packets.rate_cmaui_cmaui_port + network.incoming.packets.rate_cmaui_port_2: + - abstract_cmaui + - network.incoming.packets.rate_cmaui_cmaui_port + feature_cmaui_port_1: + - abstract_cmaui + - feature_cmaui_cmaui_port + feature_cmaui_port_2: + - abstract_cmaui + - feature_cmaui_cmaui_port + disk.write.bytes_server_cmaui_1: + - abstract_cmaui + - disk.write.bytes_cmaui + disk.write.bytes_server_cmaui_2: + - abstract_cmaui + - disk.write.bytes_cmaui + feature_server_cmaui_1: + - abstract_cmaui + - feature_cmaui + disk.allocation_server_cmaui_1: + - abstract_cmaui + - disk.allocation_cmaui + feature_server_cmaui_2: + - abstract_cmaui + - feature_cmaui + disk.allocation_server_cmaui_2: + - abstract_cmaui + - disk.allocation_cmaui + binding_server_cmaui_1: + - abstract_cmaui + - binding_cmaui + binding_server_cmaui_2: + - abstract_cmaui + - binding_cmaui + vcpus_server_cmaui_2: + - abstract_cmaui + - vcpus_cmaui + attachment_cmaui_port_2: + - abstract_cmaui + - attachment_cmaui_cmaui_port + scalable_server_cmaui_2: + - abstract_cmaui + - scalable_cmaui + scalable_server_cmaui_1: + - abstract_cmaui + - scalable_cmaui + network.outgoing.packets.rate_cmaui_port_1: + - abstract_cmaui + - network.outgoing.packets.rate_cmaui_cmaui_port + network.outgoing.packets.rate_cmaui_port_2: + - abstract_cmaui + - network.outgoing.packets.rate_cmaui_cmaui_port + attachment_cmaui_port_1: + - abstract_cmaui + - attachment_cmaui_cmaui_port + disk.write.requests_server_cmaui_2: + - abstract_cmaui + - disk.write.requests_cmaui + disk.write.requests_server_cmaui_1: + - abstract_cmaui + - disk.write.requests_cmaui + disk.usage_server_cmaui_1: + - abstract_cmaui + - disk.usage_cmaui + disk.usage_server_cmaui_2: + - abstract_cmaui + - disk.usage_cmaui + endpoint_server_cmaui_1: + - abstract_cmaui + - endpoint_cmaui + endpoint_server_cmaui_2: + - abstract_cmaui + - endpoint_cmaui + os_server_cmaui_2: + - abstract_cmaui + - os_cmaui + os_server_cmaui_1: + - abstract_cmaui + - os_cmaui + forwarder_cmaui_port_2: + - abstract_cmaui + - forwarder_cmaui_cmaui_port + forwarder_cmaui_port_1: + - abstract_cmaui + - forwarder_cmaui_cmaui_port + disk.device.allocation_server_cmaui_1: + - abstract_cmaui + - disk.device.allocation_cmaui + disk.device.allocation_server_cmaui_2: + - abstract_cmaui + - disk.device.allocation_cmaui + memory_server_cmaui_1: + - abstract_cmaui + - memory_cmaui + host_server_cmaui_2: + - abstract_cmaui + - host_cmaui + host_server_cmaui_1: + - abstract_cmaui + - host_cmaui + instance_server_cmaui_2: + - abstract_cmaui + - instance_cmaui + disk.device.capacity_server_cmaui_1: + - abstract_cmaui + - disk.device.capacity_cmaui + instance_server_cmaui_1: + - abstract_cmaui + - instance_cmaui + disk.device.read.requests.rate_server_cmaui_1: + - abstract_cmaui + - disk.device.read.requests.rate_cmaui + network.incoming.bytes.rate_cmaui_port_1: + - abstract_cmaui + - network.incoming.bytes.rate_cmaui_cmaui_port + network.incoming.bytes.rate_cmaui_port_2: + - abstract_cmaui + - network.incoming.bytes.rate_cmaui_cmaui_port + vcpus_server_cmaui_1: + - abstract_cmaui + - vcpus_cmaui + disk.device.read.requests_server_cmaui_2: + - abstract_cmaui + - disk.device.read.requests_cmaui + disk.read.bytes.rate_server_cmaui_1: + - abstract_cmaui + - disk.read.bytes.rate_cmaui + network.outpoing.packets_cmaui_port_1: + - abstract_cmaui + - network.outpoing.packets_cmaui_cmaui_port + disk.read.bytes.rate_server_cmaui_2: + - abstract_cmaui + - disk.read.bytes.rate_cmaui + network.outpoing.packets_cmaui_port_2: + - abstract_cmaui + - network.outpoing.packets_cmaui_cmaui_port + disk.device.read.requests_server_cmaui_1: + - abstract_cmaui + - disk.device.read.requests_cmaui + cpu.delta_server_cmaui_1: + - abstract_cmaui + - cpu.delta_cmaui + cpu.delta_server_cmaui_2: + - abstract_cmaui + - cpu.delta_cmaui + disk.device.read.requests.rate_server_cmaui_2: + - abstract_cmaui + - disk.device.read.requests.rate_cmaui + memory.resident_server_cmaui_2: + - abstract_cmaui + - memory.resident_cmaui + memory.resident_server_cmaui_1: + - abstract_cmaui + - memory.resident_cmaui + disk.latency_server_cmaui_2: + - abstract_cmaui + - disk.latency_cmaui + disk.latency_server_cmaui_1: + - abstract_cmaui + - disk.latency_cmaui + memory.usage_server_cmaui_1: + - abstract_cmaui + - memory.usage_cmaui + memory.usage_server_cmaui_2: + - abstract_cmaui + - memory.usage_cmaui + requirements: + dependency_cmaui_port_1: + - abstract_cmaui + - dependency_cmaui_cmaui_port + local_storage_server_cmaui_2: + - abstract_cmaui + - local_storage_cmaui + link_cmaui_port_2: + - abstract_cmaui + - link_cmaui_cmaui_port + dependency_server_cmaui_2: + - abstract_cmaui + - dependency_cmaui + link_cmaui_port_1: + - abstract_cmaui + - link_cmaui_cmaui_port + dependency_server_cmaui_1: + - abstract_cmaui + - dependency_cmaui + dependency_cmaui_port_2: + - abstract_cmaui + - dependency_cmaui_cmaui_port + local_storage_server_cmaui_1: + - abstract_cmaui + - local_storage_cmaui diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 55cb9b5ba4..d480eddc00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,6 +48,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -375,6 +381,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -685,6 +692,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1035,6 +1043,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1243,6 +1252,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -1552,6 +1567,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 7e85a3b36c..54906d7701 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: pd_server_pd_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_port_exCP_naming replacement_policy: get_input: - port_pd_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_port_mac_requirements + order: + get_input: port_pd_server_port_order + exCP_naming: + get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag - mac_requirements: - get_input: port_pd_server_port_mac_requirements - order: - get_input: port_pd_server_port_order network_role: get_input: port_pd_server_port_network_role - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index c4f91c67a1..de0ad423a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -58,6 +58,11 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -81,30 +86,34 @@ topology_template: ps_server_ps_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_port_exCP_naming replacement_policy: get_input: - port_ps_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_port_mac_requirements + order: + get_input: port_ps_server_port_order + exCP_naming: + get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag - mac_requirements: - get_input: port_ps_server_port_mac_requirements - order: - get_input: port_ps_server_port_order network_role: get_input: port_ps_server_port_network_role - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index cb894090d9..f031518281 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -104,6 +104,8 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor + port_pd_server_port_subinterface_indicator: + - true port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -144,6 +146,8 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor + port_ps_server_port_subinterface_indicator: + - true port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml index b976cba502..1849248662 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -48,6 +48,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -375,6 +381,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -894,6 +901,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -990,6 +998,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1446,6 +1455,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1796,6 +1806,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1964,6 +1975,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_oam_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -2210,6 +2227,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2416,6 +2434,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -2493,6 +2517,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2856,6 +2881,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -3165,6 +3196,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml index faffcfb4aa..3a5ee71b1a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_oam_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -96,30 +101,34 @@ topology_template: oam_server_oam_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_oam_server_port_exCP_naming replacement_policy: get_input: - port_oam_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_oam_server_port_mac_requirements + order: + get_input: port_oam_server_port_order + exCP_naming: + get_input: port_oam_server_port_exCP_naming vlan_requirements: get_input: port_oam_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: get_input: port_oam_server_port_network_role_tag - mac_requirements: - get_input: port_oam_server_port_mac_requirements - order: - get_input: port_oam_server_port_order network_role: get_input: port_oam_server_port_network_role - subnetpoolid: - get_input: port_oam_server_port_subnetpoolid fixed_ips: get_input: - port_oam_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_oam_server_port_subnetpoolid network: get_input: - port_oam_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml index 7e85a3b36c..54906d7701 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: pd_server_pd_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_port_exCP_naming replacement_policy: get_input: - port_pd_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_port_mac_requirements + order: + get_input: port_pd_server_port_order + exCP_naming: + get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag - mac_requirements: - get_input: port_pd_server_port_mac_requirements - order: - get_input: port_pd_server_port_order network_role: get_input: port_pd_server_port_network_role - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml index c4f91c67a1..de0ad423a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml @@ -58,6 +58,11 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -81,30 +86,34 @@ topology_template: ps_server_ps_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_port_exCP_naming replacement_policy: get_input: - port_ps_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_port_mac_requirements + order: + get_input: port_ps_server_port_order + exCP_naming: + get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag - mac_requirements: - get_input: port_ps_server_port_mac_requirements - order: - get_input: port_ps_server_port_order network_role: get_input: port_ps_server_port_network_role - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml index 57d6ce0980..bb990b977e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -96,30 +101,34 @@ topology_template: sm_server_sm_server_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_sm_server_port_exCP_naming replacement_policy: get_input: - port_sm_server_port_replacement_policy - index_value + mac_requirements: + get_input: port_sm_server_port_mac_requirements + order: + get_input: port_sm_server_port_order + exCP_naming: + get_input: port_sm_server_port_exCP_naming vlan_requirements: get_input: port_sm_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_sm_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: get_input: port_sm_server_port_network_role_tag - mac_requirements: - get_input: port_sm_server_port_mac_requirements - order: - get_input: port_sm_server_port_order network_role: get_input: port_sm_server_port_network_role - subnetpoolid: - get_input: port_sm_server_port_subnetpoolid fixed_ips: get_input: - port_sm_server_port_fixed_ips - index_value + subnetpoolid: + get_input: port_sm_server_port_subnetpoolid network: get_input: - port_sm_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml index 2a9e6dd584..e3f3dd567e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-other-file-1BServiceTemplate.yaml @@ -104,6 +104,8 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor + port_pd_server_port_subinterface_indicator: + - true port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -144,6 +146,8 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor + port_ps_server_port_subinterface_indicator: + - true port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml index c658658c95..d60b76bbda 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/nested-same-file-1BServiceTemplate.yaml @@ -87,6 +87,8 @@ topology_template: get_input: sm_server_flavor port_sm_server_port_network: - get_input: net + port_sm_server_port_subinterface_indicator: + - true compute_sm_server_name: - get_input: - sm_server_names @@ -131,6 +133,8 @@ topology_template: properties: port_oam_server_port_network: - get_input: net + port_oam_server_port_subinterface_indicator: + - true port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index effa6970cd..8c643c711c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -381,6 +387,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -900,6 +907,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -996,6 +1004,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1452,6 +1461,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1802,6 +1812,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1976,6 +1987,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_oam_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -2222,6 +2239,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2428,6 +2446,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -2511,6 +2535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2880,6 +2905,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -3189,6 +3220,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index 04d15b6c5a..334615f25f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: json + port_oam_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_server_port_replacement_policy: type: list required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_oam_server_port_exCP_naming vlan_requirements: get_input: port_oam_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: get_input: port_oam_server_port_network_role_tag network_role: get_input: port_oam_server_port_network_role + subnetpoolid: + get_input: port_oam_server_port_subnetpoolid fixed_ips: get_input: - port_oam_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_oam_server_port_subnetpoolid network: get_input: - port_oam_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index 0acd6bd36f..51b0e191db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml @@ -49,6 +49,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_port_network_role_tag: type: string required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_pd_server_port_exCP_naming vlan_requirements: get_input: port_pd_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: get_input: port_pd_server_port_network_role_tag network_role: get_input: port_pd_server_port_network_role + subnetpoolid: + get_input: port_pd_server_port_subnetpoolid fixed_ips: get_input: - port_pd_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_pd_server_port_subnetpoolid network: get_input: - port_pd_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index 81ff505e41..31dc6da30a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -63,6 +63,11 @@ topology_template: port_ps_server_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_port_ip_requirements: type: list required: true @@ -102,18 +107,22 @@ topology_template: get_input: port_ps_server_port_exCP_naming vlan_requirements: get_input: port_ps_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: get_input: port_ps_server_port_network_role_tag network_role: get_input: port_ps_server_port_network_role + subnetpoolid: + get_input: port_ps_server_port_subnetpoolid fixed_ips: get_input: - port_ps_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_ps_server_port_subnetpoolid network: get_input: - port_ps_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index 430a3a7d6c..e486f79a06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: string + port_sm_server_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_sm_server_name: type: list required: true @@ -117,18 +122,22 @@ topology_template: get_input: port_sm_server_port_exCP_naming vlan_requirements: get_input: port_sm_server_port_vlan_requirements + subinterface_indicator: + get_input: + - port_sm_server_port_subinterface_indicator + - index_value ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: get_input: port_sm_server_port_network_role_tag network_role: get_input: port_sm_server_port_network_role + subnetpoolid: + get_input: port_sm_server_port_subnetpoolid fixed_ips: get_input: - port_sm_server_port_fixed_ips - index_value - subnetpoolid: - get_input: port_sm_server_port_subnetpoolid network: get_input: - port_sm_server_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml index 8d91e0c1c3..5a7b1eb96a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-other-file-1BServiceTemplate.yaml @@ -107,6 +107,8 @@ topology_template: - get_input: net vm_flavor_name: get_input: pd_server_flavor + port_pd_server_port_subinterface_indicator: + - true port_pd_server_port_fixed_ips: - ip_address: get_input: @@ -149,6 +151,8 @@ topology_template: - 0 vm_flavor_name: get_input: ps_server_flavor + port_ps_server_port_subinterface_indicator: + - true port_ps_server_port_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml index 4299100dba..dfabe8d42e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/nested-same-file-1BServiceTemplate.yaml @@ -87,6 +87,8 @@ topology_template: get_input: sm_server_flavor port_sm_server_port_network: - get_input: net + port_sm_server_port_subinterface_indicator: + - true compute_sm_server_name: - get_input: - sm_server_names @@ -136,6 +138,8 @@ topology_template: - get_input: net port_oam_server_port_security_groups: - - get_input: p1 + port_oam_server_port_subinterface_indicator: + - true port_oam_server_port_replacement_policy: - AUTO vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index f5b23edb40..462cd2559f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -372,6 +372,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -483,6 +484,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -861,6 +863,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -868,6 +871,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 07a842e260..3735042d2d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,12 +128,24 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean + port_cdi_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -456,6 +468,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -578,6 +591,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -619,12 +633,6 @@ node_types: org.openecomp.resource.abstract.nodes.lbd: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -637,12 +645,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -655,22 +657,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -701,26 +687,16 @@ node_types: type: integer required: true status: SUPPORTED - port_lbd_internal_1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_dpdk_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED + type: boolean port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -749,6 +725,92 @@ node_types: type: string required: true status: SUPPORTED + compute_lbd_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_1_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + compute_lbd_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_lbd_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -789,18 +851,6 @@ node_types: type: string required: true status: SUPPORTED - compute_lbd_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -813,16 +863,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_1_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -839,26 +879,18 @@ node_types: status: SUPPORTED entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_internal_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: boolean port_lbd_dpdk_1_port_network_role: type: string required: true @@ -994,6 +1026,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1255,6 +1288,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1349,6 +1383,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1407,6 +1442,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -1527,6 +1568,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_oam_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_oam_availability_zone: type: list required: true @@ -1656,6 +1703,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1932,6 +1980,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1988,6 +2037,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_oam_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -2086,6 +2141,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_oam_internal_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2424,6 +2485,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2496,6 +2558,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2894,6 +2957,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3171,6 +3235,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3279,6 +3344,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_cdi_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -3413,6 +3484,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cdi_metadata: type: list required: true @@ -3624,6 +3701,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3631,6 +3709,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3868,18 +3947,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -3892,22 +3959,10 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_internal_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -3924,26 +3979,10 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED port_lbd_dpdk_0_port_ip_requirements: type: list required: true @@ -3954,26 +3993,12 @@ node_types: type: integer required: true status: SUPPORTED - port_lbd_ims_core_0_port_network_role: - type: string - required: true - status: SUPPORTED port_lbd_ims_core_0_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true - status: SUPPORTED port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3990,32 +4015,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_dpdk_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 + type: boolean port_lbd_ims_core_0_port_network_role_tag: type: string required: true @@ -4030,12 +4035,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_ims_core_0_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_dpdk_0_port_order: type: integer required: true @@ -4046,16 +4045,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + port_lbd_ims_core_0_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: boolean port_lbd_internal_0_port_network: type: list required: true @@ -4066,42 +4061,144 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_lbd_metadata: + compute_lbd_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - compute_lbd_name: + port_lbd_ims_core_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_ip_requirements: + port_lbd_internal_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_dpdk_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_lbd_ims_core_0_port_name: + port_lbd_dpdk_0_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: + port_lbd_internal_0_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_internal_0_port_order: + type: integer + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_0_port_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_internal_0_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_lbd_lbd_ims_core_0_port: capability: tosca.capabilities.Node @@ -4287,6 +4384,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4417,6 +4515,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4436,6 +4535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4648,10 +4748,22 @@ node_types: type: string required: true status: SUPPORTED + port_cif_internal_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true status: SUPPORTED + port_cif_ims_core_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -4662,6 +4774,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_ims_li_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -4746,6 +4864,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_oam_1_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -4960,6 +5084,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_cif_oam_1_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -5483,6 +5613,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5540,6 +5671,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5552,6 +5684,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5588,6 +5721,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5625,6 +5759,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6075,6 +6210,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6207,6 +6343,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -6285,6 +6427,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -6440,6 +6588,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6465,6 +6614,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7088,6 +7238,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7365,6 +7516,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7479,6 +7631,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_oam_0_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -7633,6 +7791,18 @@ node_types: type: integer required: true status: SUPPORTED + port_cif_ims_core_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_cif_ims_li_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -7649,6 +7819,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_cif_oam_0_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -7725,6 +7901,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true @@ -8101,6 +8283,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8256,6 +8439,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8269,6 +8453,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8328,6 +8513,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8389,6 +8575,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -8889,6 +9076,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index b78169323f..d01b20e756 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -2094,6 +2094,8 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: mac_count_required: is_required: false + port_cdi_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: @@ -2168,6 +2170,8 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + port_cdi_internal_1_port_subinterface_indicator: + - true compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2549,8 +2553,6 @@ topology_template: get_input: lbd_ims_core_v6_vip_0 compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true port_lbd_internal_1_port_name: - str_replace: template: $PREFIX$DELeth0 @@ -2564,6 +2566,47 @@ topology_template: - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 + vm_flavor_name: + get_input: lbd_flavor_name + port_lbd_ims_core_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_availability_zone: + - get_input: availability_zone_1 + vm_image_name: + get_input: lbd_image_name + port_lbd_dpdk_1_port_subinterface_indicator: + - true + port_lbd_dpdk_1_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_ims_core_1_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + compute_lbd_scheduler_hints: + - group: lbd_server_group_group + port_lbd_dpdk_1_port_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_internal_1_port_network: + - cscf_internal_network_0 + port_lbd_internal_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_name: + - get_input: lbd_name_1 + port_lbd_ims_core_1_port_network_role_tag: ims_core + compute_lbd_config_drive: + - true port_lbd_ims_core_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2578,13 +2621,8 @@ topology_template: port_lbd_dpdk_1_port_mac_requirements: mac_count_required: is_required: false - vm_flavor_name: - get_input: lbd_flavor_name - port_lbd_ims_core_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_availability_zone: - - get_input: availability_zone_1 + port_lbd_ims_core_1_port_subinterface_indicator: + - true port_lbd_internal_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2598,18 +2636,6 @@ topology_template: is_required: false port_lbd_internal_1_port_security_groups: - - cscf_RSG - vm_image_name: - get_input: lbd_image_name - port_lbd_dpdk_1_port_network: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter port_lbd_ims_core_1_port_security_groups: - - cscf_RSG port_lbd_ims_core_1_port_fixed_ips: @@ -2620,23 +2646,11 @@ topology_template: get_input: lbd_internal_ip_1 port_lbd_ims_core_1_port_network: - get_input: ims_core_net_id - compute_lbd_scheduler_hints: - - group: lbd_server_group_group - port_lbd_dpdk_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: lbd_name_1 - $DEL: - get_input: vcscf_name_delimeter port_lbd_dpdk_1_port_security_groups: - - cscf_RSG port_lbd_dpdk_1_port_fixed_ips: - ip_address: get_input: lbd_internal_dpdk_ip_1 - port_lbd_internal_1_port_network: - - cscf_internal_network_0 port_lbd_dpdk_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2658,12 +2672,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_1 - port_lbd_ims_core_1_port_network_role_tag: ims_core + port_lbd_internal_1_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2921,8 +2931,12 @@ topology_template: get_input: cdi_internal_ip_0 - ip_address: get_input: cdi_internal_v6_ip_0 + port_cdi_ims_core_0_port_subinterface_indicator: + - true compute_cdi_config_drive: - true + port_cdi_internal_0_port_subinterface_indicator: + - true port_cdi_internal_0_port_security_groups: - - cscf_RSG port_cdi_ims_core_0_port_security_groups: @@ -3017,6 +3031,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_oam_oam_1_port_subinterface_indicator: + - true port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -3070,6 +3086,8 @@ topology_template: get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group + port_oam_internal_1_port_subinterface_indicator: + - true compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -3113,6 +3131,8 @@ topology_template: - substitutable properties: port_oam_oam_2_port_network_role_tag: oam + port_oam_oam_2_port_subinterface_indicator: + - true port_oam_oam_2_port_security_groups: - - cscf_RSG port_oam_oam_2_port_name: @@ -3156,6 +3176,8 @@ topology_template: port_oam_oam_2_port_mac_requirements: mac_count_required: is_required: false + port_oam_internal_2_port_subinterface_indicator: + - true port_oam_oam_2_port_network: - get_input: oam_net_id compute_oam_user_data_format: @@ -3308,6 +3330,8 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter + port_oam_internal_0_port_subinterface_indicator: + - true port_oam_oam_0_port_fixed_ips: - ip_address: get_input: oam_oam_ip_0 @@ -3349,6 +3373,8 @@ topology_template: port_oam_internal_0_port_fixed_ips: - ip_address: get_input: oam_internal_ip_0 + port_oam_oam_0_port_subinterface_indicator: + - true port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW @@ -3415,17 +3441,8 @@ topology_template: properties: compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true - port_lbd_dpdk_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_0 - port_lbd_internal_0_port_security_groups: - - - cscf_RSG vm_flavor_name: get_input: lbd_flavor_name - port_lbd_dpdk_0_port_security_groups: - - - cscf_RSG compute_lbd_availability_zone: - get_input: availability_zone_0 port_lbd_dpdk_0_port_allowed_address_pairs: @@ -3435,14 +3452,6 @@ topology_template: - ip_address: 8000::/1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter port_lbd_dpdk_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3456,8 +3465,6 @@ topology_template: is_required: false port_lbd_ims_core_0_port_network: - get_input: ims_core_net_id - port_lbd_dpdk_0_port_network: - - cscf_internal_dpdk_network_0 port_lbd_ims_core_0_port_mac_requirements: mac_count_required: is_required: false @@ -3472,15 +3479,14 @@ topology_template: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter + port_lbd_internal_0_port_subinterface_indicator: + - true port_lbd_ims_core_0_port_network_role_tag: ims_core compute_lbd_scheduler_hints: - group: lbd_server_group_group port_lbd_internal_0_port_mac_requirements: mac_count_required: is_required: false - port_lbd_ims_core_0_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_0 port_lbd_ims_core_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3492,14 +3498,52 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_lbd_internal_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_ip_0 + port_lbd_ims_core_0_port_subinterface_indicator: + - true port_lbd_internal_0_port_network: - cscf_internal_network_0 port_lbd_dpdk_0_port_mac_requirements: mac_count_required: is_required: false + compute_lbd_name: + - get_input: lbd_name_0 + port_lbd_ims_core_0_port_security_groups: + - - cscf_RSG + port_lbd_ims_core_0_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + compute_lbd_config_drive: + - true + port_lbd_dpdk_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_dpdk_ip_0 + port_lbd_internal_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_dpdk_0_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_dpdk_0_port_subinterface_indicator: + - true + port_lbd_ims_core_0_port_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_0 + port_lbd_internal_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_0 compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -3510,8 +3554,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - compute_lbd_name: - - get_input: lbd_name_0 port_lbd_internal_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3523,16 +3565,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_lbd_ims_core_0_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 @@ -3778,6 +3810,8 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter + port_cif_oam_0_port_3_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3845,6 +3879,10 @@ topology_template: get_input: vcscf_name_delimeter port_cif_internal_0_port_network: - cscf_internal_network_0 + port_cif_ims_core_0_port_subinterface_indicator: + - true + port_cif_ims_li_0_port_subinterface_indicator: + - true port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: @@ -3861,6 +3899,8 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: mac_count_required: is_required: false + port_cif_oam_0_port_1_subinterface_indicator: + - true port_cif_oam_0_port_1_network: - get_input: oam_net_id port_cif_ims_li_0_port_security_groups: @@ -3883,6 +3923,8 @@ topology_template: port_cif_ims_li_0_port_allowed_address_pairs: - ip_address: get_input: cif_ims_li_v6_vip_0 + port_cif_internal_0_port_subinterface_indicator: + - true port_cif_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -3981,10 +4023,16 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: cif_flavor_name + port_cif_internal_1_port_subinterface_indicator: + - true + port_cif_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: - RAW + port_cif_ims_li_1_port_subinterface_indicator: + - true port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 @@ -4026,6 +4074,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cif_oam_1_port_1_subinterface_indicator: + - true port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 @@ -4139,6 +4189,8 @@ topology_template: get_input: vcscf_name_delimeter compute_cif_config_drive: - true + port_cif_oam_1_port_3_subinterface_indicator: + - true port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index 4f2606ad61..ab4499b8d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -108,11 +108,21 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cdi_ims_core_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cdi_config_drive: type: list required: true entry_schema: type: boolean + port_cdi_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -178,6 +188,10 @@ topology_template: get_input: port_cdi_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_ims_core_0_port_ip_requirements network_role_tag: @@ -251,6 +265,10 @@ topology_template: get_input: port_cdi_internal_0_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index ab2fb23db2..462ce4b069 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -36,6 +36,11 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_cdi_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -146,6 +151,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cdi_metadata: type: list required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_cdi_internal_1_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_internal_1_port_ip_requirements network_role_tag: @@ -251,6 +265,10 @@ topology_template: get_input: port_cdi_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cdi_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cdi_ims_core_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index d413c1ff9a..275a1ecb4d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -42,6 +42,11 @@ topology_template: required: true entry_schema: type: string + port_cif_oam_0_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -165,6 +170,16 @@ topology_template: port_cif_ims_core_0_port_order: type: integer required: true + port_cif_ims_core_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_cif_ims_li_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -178,6 +193,11 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_cif_oam_0_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -239,6 +259,11 @@ topology_template: port_cif_ims_core_0_port_subnetpoolid: type: string required: true + port_cif_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true @@ -368,6 +393,10 @@ topology_template: get_input: port_cif_internal_0_port_exCP_naming vlan_requirements: get_input: port_cif_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_internal_0_port_ip_requirements network_role_tag: @@ -410,6 +439,10 @@ topology_template: get_input: port_cif_ims_li_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_li_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_li_0_port_ip_requirements network_role_tag: @@ -452,6 +485,10 @@ topology_template: get_input: port_cif_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_core_0_port_ip_requirements network_role_tag: @@ -494,6 +531,10 @@ topology_template: get_input: port_cif_oam_0_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_0_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: @@ -536,6 +577,10 @@ topology_template: get_input: port_cif_oam_0_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_0_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index 380440f67c..a2d95fddbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -40,9 +40,19 @@ topology_template: vm_flavor_name: type: string required: true + port_cif_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true + port_cif_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -51,6 +61,11 @@ topology_template: required: true entry_schema: type: string + port_cif_ims_li_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -119,6 +134,11 @@ topology_template: port_cif_ims_li_1_port_network_role: type: string required: true + port_cif_oam_1_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -292,6 +312,11 @@ topology_template: port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_cif_oam_1_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -368,6 +393,10 @@ topology_template: get_input: port_cif_ims_li_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_li_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_li_1_port_ip_requirements network_role_tag: @@ -410,6 +439,10 @@ topology_template: get_input: port_cif_internal_1_port_exCP_naming vlan_requirements: get_input: port_cif_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_internal_1_port_ip_requirements network_role_tag: @@ -452,6 +485,10 @@ topology_template: get_input: port_cif_oam_1_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_1_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: @@ -494,6 +531,10 @@ topology_template: get_input: port_cif_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_ims_core_1_port_ip_requirements network_role_tag: @@ -536,6 +577,10 @@ topology_template: get_input: port_cif_oam_1_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_cif_oam_1_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 4e544f5c9c..34628a22a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,11 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -26,11 +21,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -41,19 +31,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -77,22 +54,14 @@ topology_template: port_lbd_internal_1_port_order: type: integer required: true - port_lbd_internal_1_port_ip_requirements: - type: list + vm_image_name: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: + port_lbd_dpdk_1_port_subinterface_indicator: type: list required: true entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - vm_image_name: - type: string - required: true + type: boolean port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -115,6 +84,76 @@ topology_template: port_lbd_ims_core_1_port_network_role: type: string required: true + compute_lbd_scheduler_hints: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_1_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_ims_core_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -148,16 +187,6 @@ topology_template: port_lbd_dpdk_1_port_network_role_tag: type: string required: true - compute_lbd_scheduler_hints: - type: list - required: true - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -168,14 +197,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_1_port_network: - type: list - required: true - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -189,22 +210,16 @@ topology_template: required: true entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_internal_1_port_subinterface_indicator: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true + type: boolean port_lbd_dpdk_1_port_network_role: type: string required: true @@ -226,6 +241,10 @@ topology_template: get_input: port_lbd_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_ims_core_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_ims_core_1_port_ip_requirements network_role_tag: @@ -268,6 +287,10 @@ topology_template: get_input: port_lbd_dpdk_1_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_dpdk_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_dpdk_1_port_ip_requirements network_role_tag: @@ -308,18 +331,22 @@ topology_template: get_input: port_lbd_internal_1_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_internal_1_port_ip_requirements network_role_tag: get_input: port_lbd_internal_1_port_network_role_tag network_role: get_input: port_lbd_internal_1_port_network_role + subnetpoolid: + get_input: port_lbd_internal_1_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_1_port_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - port_lbd_internal_1_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 86141e1fb2..15b0d89cd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -19,16 +19,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -38,19 +28,9 @@ topology_template: port_lbd_internal_0_port_network_role: type: string required: true - port_lbd_internal_0_port_security_groups: - type: list - required: true - entry_schema: - type: json vm_flavor_name: type: string required: true - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -64,22 +44,9 @@ topology_template: port_lbd_dpdk_0_port_subnetpoolid: type: string required: true - port_lbd_dpdk_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_lbd_dpdk_0_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true port_lbd_dpdk_0_port_ip_requirements: type: list required: true @@ -88,22 +55,11 @@ topology_template: port_lbd_ims_core_0_port_order: type: integer required: true - port_lbd_ims_core_0_port_network_role: - type: string - required: true port_lbd_ims_core_0_port_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -117,27 +73,11 @@ topology_template: required: true entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer - required: true - port_lbd_dpdk_0_port_network_role: - type: string - required: true - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_internal_0_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 + type: boolean port_lbd_ims_core_0_port_network_role_tag: type: string required: true @@ -149,11 +89,6 @@ topology_template: port_lbd_internal_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_dpdk_0_port_order: type: integer required: true @@ -162,14 +97,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_0_port_fixed_ips: + port_lbd_ims_core_0_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: boolean port_lbd_internal_0_port_network: type: list required: true @@ -178,36 +110,119 @@ topology_template: port_lbd_dpdk_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_lbd_metadata: + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true entry_schema: type: json - compute_lbd_name: + port_lbd_ims_core_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_ip_requirements: + port_lbd_internal_0_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_dpdk_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_security_groups: type: list required: true entry_schema: type: json - port_lbd_ims_core_0_port_name: + port_lbd_dpdk_0_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: + port_lbd_internal_0_port_subnetpoolid: + type: string + required: true + port_lbd_ims_core_0_port_network_role: + type: string + required: true + port_lbd_dpdk_0_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + port_lbd_dpdk_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_lbd_internal_0_port_order: + type: integer + required: true + port_lbd_dpdk_0_port_network_role: + type: string + required: true + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: + type: list + required: true + entry_schema: + type: json + port_lbd_internal_0_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: lbd_lbd_ims_core_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -226,6 +241,10 @@ topology_template: get_input: port_lbd_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_ims_core_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_ims_core_0_port_ip_requirements network_role_tag: @@ -268,6 +287,10 @@ topology_template: get_input: port_lbd_dpdk_0_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_dpdk_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_dpdk_0_port_ip_requirements network_role_tag: @@ -308,18 +331,22 @@ topology_template: get_input: port_lbd_internal_0_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_lbd_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_lbd_internal_0_port_ip_requirements network_role_tag: get_input: port_lbd_internal_0_port_network_role_tag network_role: get_input: port_lbd_internal_0_port_network_role + subnetpoolid: + get_input: port_lbd_internal_0_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_0_port_fixed_ips - index_value - subnetpoolid: - get_input: port_lbd_internal_0_port_subnetpoolid name: get_input: - port_lbd_internal_0_port_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index 0925522b81..1448429d91 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_oam_internal_0_port_subnetpoolid: type: string required: true + port_oam_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -85,6 +90,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_oam_0_port_exCP_naming vlan_requirements: get_input: port_oam_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_0_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_internal_0_port_exCP_naming vlan_requirements: get_input: port_oam_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index 44fd3f4e6c..08a7d58f36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_oam_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -136,6 +141,11 @@ topology_template: required: true entry_schema: type: json + port_oam_internal_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_oam_availability_zone: type: list required: true @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_internal_1_port_exCP_naming vlan_requirements: get_input: port_oam_internal_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_1_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_oam_1_port_exCP_naming vlan_requirements: get_input: port_oam_oam_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_1_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index d5e960758c..2b4a83915e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_oam_oam_2_port_network_role_tag: type: string required: true + port_oam_oam_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -92,6 +97,11 @@ topology_template: port_oam_oam_2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_oam_internal_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -178,6 +188,10 @@ topology_template: get_input: port_oam_internal_2_port_exCP_naming vlan_requirements: get_input: port_oam_internal_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_internal_2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_internal_2_port_ip_requirements network_role_tag: @@ -220,6 +234,10 @@ topology_template: get_input: port_oam_oam_2_port_exCP_naming vlan_requirements: get_input: port_oam_oam_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_oam_oam_2_port_subinterface_indicator + - index_value ip_requirements: get_input: port_oam_oam_2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 45d6de5a23..120e1d76aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -350,6 +350,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1024,6 +1025,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1312,6 +1314,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1817,6 +1820,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2388,6 +2392,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2816,6 +2821,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3321,6 +3327,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3826,6 +3833,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4471,6 +4479,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4975,6 +4984,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5410,6 +5420,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 593d700c0f..ac8621e29b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -729,6 +729,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -748,6 +749,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -864,6 +866,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_5_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_cmaui_availability_zone: type: list required: true @@ -952,6 +960,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_cmaui_port_6_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_5_vlan_requirements: type: list required: true @@ -1119,6 +1133,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1137,6 +1152,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1429,6 +1445,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_4_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_4_fixed_ips: type: list required: true @@ -1509,6 +1531,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_4_network_role_tag: type: string required: true @@ -1689,6 +1717,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1712,6 +1741,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2228,6 +2258,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2288,6 +2319,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2317,6 +2349,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2441,6 +2474,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2514,6 +2548,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2521,6 +2556,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3236,6 +3272,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3586,6 +3623,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3770,6 +3808,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_2_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_1_security_groups: type: list required: true @@ -3858,6 +3902,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_cmaui_port_1_replacement_policy: type: list required: true @@ -4040,6 +4090,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4057,6 +4108,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4725,6 +4777,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4732,6 +4785,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4767,6 +4821,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5021,6 +5076,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5082,6 +5138,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5461,6 +5518,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6087,6 +6145,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6100,6 +6159,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6236,6 +6296,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6384,6 +6445,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml index c457e4de3d..1fc1065837 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml @@ -36,6 +36,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_5_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_cmaui_availability_zone: type: list required: true @@ -108,6 +113,11 @@ topology_template: port_cmaui_port_5_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_cmaui_port_6_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_5_vlan_requirements: type: list required: true @@ -150,18 +160,22 @@ topology_template: get_input: port_cmaui_port_5_exCP_naming vlan_requirements: get_input: port_cmaui_port_5_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_5_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_5_ip_requirements network_role_tag: get_input: port_cmaui_port_5_network_role_tag network_role: get_input: port_cmaui_port_5_network_role + subnetpoolid: + get_input: port_cmaui_port_5_subnetpoolid fixed_ips: get_input: - port_cmaui_port_5_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_5_subnetpoolid network: get_input: - port_cmaui_port_5_network @@ -190,18 +204,22 @@ topology_template: get_input: port_cmaui_port_6_exCP_naming vlan_requirements: get_input: port_cmaui_port_6_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_6_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_6_ip_requirements network_role_tag: get_input: port_cmaui_port_6_network_role_tag network_role: get_input: port_cmaui_port_6_network_role + subnetpoolid: + get_input: port_cmaui_port_6_subnetpoolid fixed_ips: get_input: - port_cmaui_port_6_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_6_subnetpoolid network: get_input: - port_cmaui_port_6_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml index 88e7795e76..178821d0f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml @@ -28,6 +28,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_4_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_4_fixed_ips: type: list required: true @@ -93,6 +98,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cmaui_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_4_network_role_tag: type: string required: true @@ -150,18 +160,22 @@ topology_template: get_input: port_cmaui_port_4_exCP_naming vlan_requirements: get_input: port_cmaui_port_4_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_4_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_4_ip_requirements network_role_tag: get_input: port_cmaui_port_4_network_role_tag network_role: get_input: port_cmaui_port_4_network_role + subnetpoolid: + get_input: port_cmaui_port_4_subnetpoolid fixed_ips: get_input: - port_cmaui_port_4_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_4_subnetpoolid network: get_input: - port_cmaui_port_4_network @@ -190,18 +204,22 @@ topology_template: get_input: port_cmaui_port_3_exCP_naming vlan_requirements: get_input: port_cmaui_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_3_ip_requirements network_role_tag: get_input: port_cmaui_port_3_network_role_tag network_role: get_input: port_cmaui_port_3_network_role + subnetpoolid: + get_input: port_cmaui_port_3_subnetpoolid fixed_ips: get_input: - port_cmaui_port_3_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_3_subnetpoolid network: get_input: - port_cmaui_port_3_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 2b0f9eec43..934995a586 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -20,6 +20,11 @@ topology_template: port_cmaui_port_1_subnetpoolid: type: string required: true + port_cmaui_port_2_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_1_security_groups: type: list required: true @@ -91,6 +96,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_cmaui_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_cmaui_port_1_replacement_policy: type: list required: true @@ -150,18 +160,22 @@ topology_template: get_input: port_cmaui_port_1_exCP_naming vlan_requirements: get_input: port_cmaui_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_1_ip_requirements network_role_tag: get_input: port_cmaui_port_1_network_role_tag network_role: get_input: port_cmaui_port_1_network_role + subnetpoolid: + get_input: port_cmaui_port_1_subnetpoolid fixed_ips: get_input: - port_cmaui_port_1_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_1_subnetpoolid network: get_input: - port_cmaui_port_1_network @@ -190,18 +204,22 @@ topology_template: get_input: port_cmaui_port_2_exCP_naming vlan_requirements: get_input: port_cmaui_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_cmaui_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_cmaui_port_2_ip_requirements network_role_tag: get_input: port_cmaui_port_2_network_role_tag network_role: get_input: port_cmaui_port_2_network_role + subnetpoolid: + get_input: port_cmaui_port_2_subnetpoolid fixed_ips: get_input: - port_cmaui_port_2_fixed_ips - index_value - subnetpoolid: - get_input: port_cmaui_port_2_subnetpoolid network: get_input: - port_cmaui_port_2_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index 874a66235e..cacc945f82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml @@ -62,6 +62,8 @@ topology_template: directives: - substitutable properties: + port_cmaui_port_2_subinterface_indicator: + - true port_cmaui_port_1_security_groups: - - get_input: p1 - get_input: p2 @@ -104,6 +106,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_cmaui_port_1_subinterface_indicator: + - true port_cmaui_port_1_replacement_policy: - AUTO port_cmaui_port_2_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index a1af262451..0b844f9664 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -89,6 +89,8 @@ topology_template: - get_input: - cmaui_names - 0 + port_cmaui_port_4_subinterface_indicator: + - true port_cmaui_port_4_fixed_ips: - ip_address: get_input: @@ -121,6 +123,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_cmaui_port_3_subinterface_indicator: + - true port_cmaui_port_4_replacement_policy: - AUTO port_cmaui_port_3_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index bfff4ade12..5f47aa5ee7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -115,6 +115,8 @@ topology_template: - get_input: - cmaui_names - 0 + port_cmaui_port_5_subinterface_indicator: + - true compute_cmaui_availability_zone: - get_input: availability_zone_0 vm_image_name: @@ -159,6 +161,8 @@ topology_template: port_cmaui_port_5_mac_requirements: mac_count_required: is_required: false + port_cmaui_port_6_subinterface_indicator: + - true port_cmaui_port_6_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 938583febf..5872b05b1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -485,6 +485,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -510,6 +511,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -899,6 +901,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -906,6 +909,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1643,6 +1647,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1668,6 +1673,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2057,6 +2063,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2064,6 +2071,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 19bf6af97c..bb77b07fc2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -325,6 +325,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -332,6 +333,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1055,6 +1057,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1075,6 +1078,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1478,6 +1482,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1485,6 +1490,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7a2181b31f..7b832db48c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -320,6 +320,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -327,6 +328,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1050,6 +1052,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1070,6 +1073,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1468,6 +1472,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1475,6 +1480,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8e4a86e326..41c0fbbe84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -310,6 +310,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -317,6 +318,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -587,6 +589,12 @@ node_types: type: string required: true status: SUPPORTED + port_compute_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -781,6 +789,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index 1b3bcb7445..735d2e4a51 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -330,6 +330,8 @@ topology_template: - get_attribute: - server_pcm_001 - oam_net_gw + port_compute_port_subinterface_indicator: + - true compute_compute_name: - compute_name: null vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index e067cb55ac..b2dbb10079 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_compute_port_subnetpoolid: type: string required: true + port_compute_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -117,6 +122,10 @@ topology_template: get_input: port_compute_port_exCP_naming vlan_requirements: get_input: port_compute_port_vlan_requirements + subinterface_indicator: + get_input: + - port_compute_port_subinterface_indicator + - index_value ip_requirements: get_input: port_compute_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index ca53e2c90c..76ab120c93 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -196,6 +196,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -513,6 +514,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index ea59bc8bfe..56124f643d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -354,6 +360,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -664,6 +671,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -671,6 +679,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 0db0a41bd7..47887b4f3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -114,6 +119,10 @@ topology_template: pcm_server_pcm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_mac_requirements + order: + get_input: port_pcm_port_order security_groups: get_input: - port_pcm_port_security_groups @@ -122,22 +131,22 @@ topology_template: get_input: port_pcm_port_exCP_naming vlan_requirements: get_input: port_pcm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_ip_requirements network_role_tag: get_input: port_pcm_port_network_role_tag - mac_requirements: - get_input: port_pcm_port_mac_requirements - order: - get_input: port_pcm_port_order network_role: get_input: port_pcm_port_network_role - subnetpoolid: - get_input: port_pcm_port_subnetpoolid fixed_ips: get_input: - port_pcm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_subnetpoolid network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index aaec66c8cc..4fee609326 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -118,6 +118,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -165,6 +167,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true compute_pcm_server_user_data_format: - RAW vm_image_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 84d7863050..72a100052d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -191,6 +197,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -506,6 +513,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -792,6 +805,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1117,6 +1131,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1124,6 +1139,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 0db0a41bd7..47887b4f3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_pcm_server_user_data_format: type: list required: true @@ -114,6 +119,10 @@ topology_template: pcm_server_pcm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_mac_requirements + order: + get_input: port_pcm_port_order security_groups: get_input: - port_pcm_port_security_groups @@ -122,22 +131,22 @@ topology_template: get_input: port_pcm_port_exCP_naming vlan_requirements: get_input: port_pcm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_ip_requirements network_role_tag: get_input: port_pcm_port_network_role_tag - mac_requirements: - get_input: port_pcm_port_mac_requirements - order: - get_input: port_pcm_port_order network_role: get_input: port_pcm_port_network_role - subnetpoolid: - get_input: port_pcm_port_subnetpoolid fixed_ips: get_input: - port_pcm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_subnetpoolid network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 8b9d88dd85..ccee6999af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -114,6 +119,10 @@ topology_template: pd_server_pcm_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_pcm_port_mac_requirements + order: + get_input: port_pcm_port_order security_groups: get_input: - port_pcm_port_security_groups @@ -122,22 +131,22 @@ topology_template: get_input: port_pcm_port_exCP_naming vlan_requirements: get_input: port_pcm_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pcm_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pcm_port_ip_requirements network_role_tag: get_input: port_pcm_port_network_role_tag - mac_requirements: - get_input: port_pcm_port_mac_requirements - order: - get_input: port_pcm_port_order network_role: get_input: port_pcm_port_network_role - subnetpoolid: - get_input: port_pcm_port_subnetpoolid fixed_ips: get_input: - port_pcm_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pcm_port_subnetpoolid network: get_input: - port_pcm_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 89833ddbb7..9660d747ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -136,6 +136,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -183,6 +185,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pcm_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name compute_pd_server_config_drive: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index eeb29c1c14..bc682ab7b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -348,6 +348,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -461,6 +462,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -917,6 +919,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1041,6 +1044,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1448,6 +1452,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1455,6 +1460,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index f902040da6..7268317fcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -348,6 +348,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -461,6 +462,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -879,6 +881,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -886,6 +889,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1486,6 +1490,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1599,6 +1604,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index c5748afcc2..3a0a107c2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -310,6 +310,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -317,6 +318,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -879,6 +881,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -886,6 +889,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2aab911a51..c618732ca8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -303,6 +309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 4bfad639fb..aeaeda46f0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -1,143 +1,146 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml index 934495ab29..2e8cac336a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cab2c17b7..9add418772 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -313,6 +319,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index b74492bbb5..2c371cd6be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -1,167 +1,170 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- network_policy_server_pd_01:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
- properties:
- name:
- get_attribute:
- - abstract_pd_server
- - pd_server_accessIPv4
- network_policy_server_pd_02:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
- properties:
- name:
- get_attribute:
- - abstract_pd_server
- - pd_server_accessIPv6
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- network_policy_port0:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
- properties:
- entries:
- get_attribute:
- - abstract_pd_server
- - pd_server_pd01_port_device_owner
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - network_policy_server_pd_01
- - network_policy_server_pd_02
- - network_policy_port0
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + network_policy_server_pd_01: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + network_policy_server_pd_02: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv6 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + network_policy_port0: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + entries: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_owner + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - network_policy_server_pd_01 + - network_policy_server_pd_02 + - network_policy_port0 + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index e83e81c207..516a938e81 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 992a6c7131..4f4dc39cdb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -309,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index c9507d5269..58d4c54c3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -1,173 +1,176 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- dummy_net_name_1:
- label: dummy net name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: dummy_net_name_1
- type: string
- description: dummy net name
- default: Network-1
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - get_attribute:
- - network_policy_server
- - name
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - get_attribute:
- - network_policy_server
- - name
- compute_pd_server_metadata:
- - get_attribute:
- - network_policy_server
- - name
- - null
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- network_policy_server:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules
- properties:
- name:
- get_input: dummy_net_name_1
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - network_policy_server
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + dummy_net_name_1: + label: dummy net name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: dummy_net_name_1 + type: string + description: dummy net name + default: Network-1 + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - get_attribute: + - network_policy_server + - name + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - get_attribute: + - network_policy_server + - name + compute_pd_server_metadata: + - get_attribute: + - network_policy_server + - name + - null + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + network_policy_server: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_input: dummy_net_name_1 + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - network_policy_server + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml index cfe0c56ce1..8e79cec55a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,6 +122,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 63a1e1964a..f6309b4565 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -291,6 +297,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index 7619d12ebb..b8d5cd6647 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -1,137 +1,140 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml index 36669edf18..4f3939bd00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -98,6 +103,10 @@ topology_template: - accessIPv4 vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 413b91c5ce..a397543a9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -309,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index 0a497cb72a..7ac39945a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -1,187 +1,190 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- packet_mirror_network_name:
- label: packet mirror network name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: packet_mirror_network_name
- type: string
- description: name of the oam network
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- jsa_security_group:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name: Test-SecurityGroup
- description: ems security group
- rules:
- - protocol: icmp
- ethertype: IPv6
- remote_ip_prefix: ::/0
- direction: ingress
- requirements:
- - port:
- capability: attachment_pd_server_pd01_port
- node: abstract_pd_server
- relationship: org.openecomp.relationships.AttachesTo
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_security_groups:
- - - jsa_security_group
- - - jsa_security_group
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- resource_with_dependOn:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_mirror_network_name
- requirements:
- - dependency:
- capability: feature_pd_server
- node: abstract_pd_server
- relationship: tosca.relationships.DependsOn
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - jsa_security_group
- - resource_with_dependOn
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + packet_mirror_network_name: + label: packet mirror network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name + type: string + description: name of the oam network + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + jsa_security_group: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: Test-SecurityGroup + description: ems security group + rules: + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + requirements: + - port: + capability: attachment_pd_server_pd01_port + node: abstract_pd_server + relationship: org.openecomp.relationships.AttachesTo + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_security_groups: + - - jsa_security_group + - - jsa_security_group + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + resource_with_dependOn: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_mirror_network_name + requirements: + - dependency: + capability: feature_pd_server + node: abstract_pd_server + relationship: tosca.relationships.DependsOn + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - jsa_security_group + - resource_with_dependOn + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index ba596578fc..b1ffb37314 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -105,26 +110,30 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd01_port_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_mac_requirements + order: + get_input: port_pd01_port_order security_groups: get_input: - port_pd01_port_security_groups - index_value exCP_naming: get_input: port_pd01_port_exCP_naming - replacement_policy: - get_input: - - port_pd01_port_replacement_policy - - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements - order: - get_input: port_pd01_port_order network_role: get_input: port_pd01_port_network_role subnetpoolid: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2aab911a51..c618732ca8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -303,6 +309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index b2a4098917..20fd689f56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -1,226 +1,229 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd01_cinder_volume_size:
- label: volume size
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd01_cinder_volume_size
- type: string
- description: volume size
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- packet_mirror_network_name:
- label: packet mirror network name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: packet_mirror_network_name
- type: string
- description: name of the network
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- pd01_volume_type:
- label: volume type
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd01_volume_type
- type: string
- description: volume type
- node_templates:
- packet_mirror_network:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- network_name:
- get_input: packet_mirror_network_name
- pd01_volume:
- type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
- properties:
- volume_type:
- get_input: pd01_volume_type
- size: '(get_input : pd01_cinder_volume_size) * 1024'
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - packet_mirror_network
- - packet_mirror_network
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - dependency_pd_server:
- capability: tosca.capabilities.Node
- node: packet_mirror_network
- relationship: tosca.relationships.DependsOn
- - link_pd_server_pd01_port:
- capability: tosca.capabilities.network.Linkable
- node: packet_mirror_network
- relationship: tosca.relationships.network.LinksTo
- - local_storage_pd_server:
- capability: tosca.capabilities.Attachment
- node: pd01_volume
- relationship: pd02_volume_attachment
- - local_storage_pd_server:
- capability: tosca.capabilities.Attachment
- node: pd01_volume
- relationship: pd01_volume_attachment
- relationship_templates:
- pd01_volume_attachment:
- type: org.openecomp.relationships.VolumeAttachesTo
- properties:
- volume_id: pd01_volume
- instance_uuid: abstract_pd_server
- pd02_volume_attachment:
- type: org.openecomp.relationships.VolumeAttachesTo
- properties:
- volume_id: pd01_volume
- instance_uuid: abstract_pd_server
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - packet_mirror_network
- - pd01_volume
- - abstract_pd_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd01_cinder_volume_size: + label: volume size + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_cinder_volume_size + type: string + description: volume size + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + packet_mirror_network_name: + label: packet mirror network name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: packet_mirror_network_name + type: string + description: name of the network + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + pd01_volume_type: + label: volume type + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd01_volume_type + type: string + description: volume type + node_templates: + packet_mirror_network: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: packet_mirror_network_name + pd01_volume: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: pd01_volume_type + size: '(get_input : pd01_cinder_volume_size) * 1024' + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - packet_mirror_network + - packet_mirror_network + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - dependency_pd_server: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn + - link_pd_server_pd01_port: + capability: tosca.capabilities.network.Linkable + node: packet_mirror_network + relationship: tosca.relationships.network.LinksTo + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: pd01_volume + relationship: pd02_volume_attachment + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: pd01_volume + relationship: pd01_volume_attachment + relationship_templates: + pd01_volume_attachment: + type: org.openecomp.relationships.VolumeAttachesTo + properties: + volume_id: pd01_volume + instance_uuid: abstract_pd_server + pd02_volume_attachment: + type: org.openecomp.relationships.VolumeAttachesTo + properties: + volume_id: pd01_volume + instance_uuid: abstract_pd_server + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - packet_mirror_network + - pd01_volume + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 934495ab29..2e8cac336a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 136beed812..a601dbb5e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -309,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 54a5e568e6..972bf385c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -1,158 +1,161 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_scheduler_hints:
- - group: BE_Affinity_group
- - group: BE_Affinity_group
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
- BE_Affinity_group:
- type: tosca.groups.Root
- members:
- - abstract_pd_server
- policies:
- BE_Affinity_policy:
- type: org.openecomp.policies.placement.Colocate
- properties:
- name: Policy_BE_Affinity
- affinity: host
- targets:
- - BE_Affinity_group
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_scheduler_hints: + - group: BE_Affinity_group + - group: BE_Affinity_group + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + BE_Affinity_group: + type: tosca.groups.Root + members: + - abstract_pd_server + policies: + BE_Affinity_policy: + type: org.openecomp.policies.placement.Colocate + properties: + name: Policy_BE_Affinity + affinity: host + targets: + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml index 3930dd96bd..a14f0c9043 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,6 +122,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index cec889b729..a82d2208e4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -313,6 +319,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index bcee7d58cb..9785f5bf03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -1,162 +1,165 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO_PORT_1
- - AUTO_PORT_0
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-1
- - Network-0
- compute_pd_server_user_data_format:
- - RAW_SERVER_PD_2
- - RAW_SERVER_PD_1
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
- outputs:
- output_attr_port_pd_0:
- description: output attr port0
- value:
- get_attribute:
- - abstract_pd_server
- - pd_server_pd01_port_device_id
- output_attr_server_pd_1:
- description: output attr pd1
- value:
- get_attribute:
- - abstract_pd_server
- - pd_server_accessIPv4
- output_attr_server_pd_2:
- description: output attr pd2
- value:
- get_attribute:
- - abstract_pd_server
- - pd_server_accessIPv6
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-1 + - Network-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - RAW_SERVER_PD_2 + - RAW_SERVER_PD_1 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + outputs: + output_attr_port_pd_0: + description: output attr port0 + value: + get_attribute: + - abstract_pd_server + - pd_server_pd01_port_device_id + output_attr_server_pd_1: + description: output attr pd1 + value: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + output_attr_server_pd_2: + description: output attr pd2 + value: + get_attribute: + - abstract_pd_server + - pd_server_accessIPv6 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 2c5375f7a2..562554f743 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 367c3bb280..102326a14f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -303,6 +309,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -474,6 +481,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -796,6 +809,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 9f29064a0f..96b39a73f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -1,255 +1,261 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- ps_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPS001
- - ZRDM1MOGX01MPS002
- - ZRDM1MOGX01MPS003
- - ZRDM1MOGX01MPS004
- entry_schema:
- type: string
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- ps_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- ps_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO
- - AUTO
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-PD-1
- - Network-PD-0
- compute_pd_server_user_data_format:
- - null
- - RAW
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_ps_server:
- type: org.openecomp.resource.abstract.nodes.ps_server
- directives:
- - substitutable
- properties:
- compute_ps_server_name:
- - get_input:
- - ps_server_names
- - 0
- - get_input:
- - ps_server_names
- - 1
- compute_ps_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_ps_server_user_data_format:
- - null
- - RAW
- vm_flavor_name:
- get_input: ps_flavor_name
- vm_image_name:
- get_input: ps_image_name
- port_ps01_port_replacement_policy:
- - AUTO
- - AUTO
- port_ps01_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps01_port_network:
- - Network-PS-0
- - Network-PS-1
- port_ps01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_ps_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
- - abstract_ps_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + ps_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPS001 + - ZRDM1MOGX01MPS002 + - ZRDM1MOGX01MPS003 + - ZRDM1MOGX01MPS004 + entry_schema: + type: string + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + ps_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + ps_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-PD-1 + - Network-PD-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - null + - RAW + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server: + type: org.openecomp.resource.abstract.nodes.ps_server + directives: + - substitutable + properties: + compute_ps_server_name: + - get_input: + - ps_server_names + - 0 + - get_input: + - ps_server_names + - 1 + compute_ps_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_ps_server_user_data_format: + - null + - RAW + vm_flavor_name: + get_input: ps_flavor_name + port_ps01_port_subinterface_indicator: + - true + - true + vm_image_name: + get_input: ps_image_name + port_ps01_port_replacement_policy: + - AUTO + - AUTO + port_ps01_port_mac_requirements: + mac_count_required: + is_required: false + port_ps01_port_network: + - Network-PS-0 + - Network-PS-1 + port_ps01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_ps_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml index 934495ab29..2e8cac336a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml index fe95a3ba16..5636f4b752 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1d716d84ee..3b488ab0e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -62,6 +62,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -307,6 +313,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -478,6 +485,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -804,6 +817,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index d3916f9b9a..f1589d077b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -1,259 +1,265 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- pd_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- ps_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPS001
- - ZRDM1MOGX01MPS002
- - ZRDM1MOGX01MPS003
- - ZRDM1MOGX01MPS004
- entry_schema:
- type: string
- availabilityzone_name:
- label: availabilityzone name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: availabilityzone_name
- type: string
- description: availabilityzone name
- default: nova
- ps_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_image_name:
- label: image name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_image_name
- type: string
- description: PD image name
- default: MOG_BASE_8.0
- pd_server_names:
- label: PD server names
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: pd_server_names
- type: list
- description: name of the PD instance
- default:
- - ZRDM1MOGX01MPD001
- - ZRDM1MOGX01MPD002
- entry_schema:
- type: string
- ps_flavor_name:
- label: PD flavor name
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - hot-mog-0108-bs1271
- source_type: HEAT
- param_name: ps_flavor_name
- type: string
- description: flavor name of PD instance
- default: m3.xlarge
- node_templates:
- abstract_pd_server:
- type: org.openecomp.resource.abstract.nodes.pd_server
- directives:
- - substitutable
- properties:
- compute_pd_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_pd_server_name:
- - get_input:
- - pd_server_names
- - 1
- - get_input:
- - pd_server_names
- - 0
- port_pd01_port_replacement_policy:
- - AUTO
- - AUTO
- vm_flavor_name:
- get_input: pd_flavor_name
- port_pd01_port_mac_requirements:
- mac_count_required:
- is_required: false
- vm_image_name:
- get_input: pd_image_name
- port_pd01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- port_pd01_port_network:
- - Network-PD-1
- - Network-PD-0
- compute_pd_server_user_data_format:
- - null
- - get_attribute:
- - abstract_ps_server
- - ps_server_accessIPv4
- service_template_filter:
- substitute_service_template: Nested_pd_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- abstract_ps_server:
- type: org.openecomp.resource.abstract.nodes.ps_server
- directives:
- - substitutable
- properties:
- compute_ps_server_name:
- - get_input:
- - ps_server_names
- - 0
- - get_input:
- - ps_server_names
- - 1
- compute_ps_server_availability_zone:
- - get_input: availabilityzone_name
- - get_input: availabilityzone_name
- compute_ps_server_user_data_format:
- - get_attribute:
- - abstract_pd_server
- - pd_server_accessIPv4
- - null
- vm_flavor_name:
- get_input: ps_flavor_name
- vm_image_name:
- get_input: ps_image_name
- port_ps01_port_replacement_policy:
- - AUTO
- - AUTO
- port_ps01_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_ps01_port_network:
- - Network-PS-0
- - Network-PS-1
- port_ps01_port_ip_requirements:
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - - ip_version: 4
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- - ip_version: 6
- ip_count_required:
- is_required: false
- floating_ip_count_required:
- is_required: false
- service_template_filter:
- substitute_service_template: Nested_ps_serverServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- groups:
- hot-mog-0108-bs1271_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
- description: heat template that creates MOG stack
- members:
- - abstract_pd_server
- - abstract_ps_server
+tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + pd_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + ps_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPS001 + - ZRDM1MOGX01MPS002 + - ZRDM1MOGX01MPS003 + - ZRDM1MOGX01MPS004 + entry_schema: + type: string + availabilityzone_name: + label: availabilityzone name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: availabilityzone_name + type: string + description: availabilityzone name + default: nova + ps_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_image_name: + label: image name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_image_name + type: string + description: PD image name + default: MOG_BASE_8.0 + pd_server_names: + label: PD server names + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: pd_server_names + type: list + description: name of the PD instance + default: + - ZRDM1MOGX01MPD001 + - ZRDM1MOGX01MPD002 + entry_schema: + type: string + ps_flavor_name: + label: PD flavor name + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - hot-mog-0108-bs1271 + source_type: HEAT + param_name: ps_flavor_name + type: string + description: flavor name of PD instance + default: m3.xlarge + node_templates: + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server + directives: + - substitutable + properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: pd_flavor_name + port_pd01_port_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network: + - Network-PD-1 + - Network-PD-0 + port_pd01_port_subinterface_indicator: + - true + - true + compute_pd_server_user_data_format: + - null + - get_attribute: + - abstract_ps_server + - ps_server_accessIPv4 + service_template_filter: + substitute_service_template: Nested_pd_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + abstract_ps_server: + type: org.openecomp.resource.abstract.nodes.ps_server + directives: + - substitutable + properties: + compute_ps_server_name: + - get_input: + - ps_server_names + - 0 + - get_input: + - ps_server_names + - 1 + compute_ps_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_ps_server_user_data_format: + - get_attribute: + - abstract_pd_server + - pd_server_accessIPv4 + - null + vm_flavor_name: + get_input: ps_flavor_name + port_ps01_port_subinterface_indicator: + - true + - true + vm_image_name: + get_input: ps_image_name + port_ps01_port_replacement_policy: + - AUTO + - AUTO + port_ps01_port_mac_requirements: + mac_count_required: + is_required: false + port_ps01_port_network: + - Network-PS-0 + - Network-PS-1 + port_ps01_port_ip_requirements: + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + service_template_filter: + substitute_service_template: Nested_ps_serverServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + groups: + hot-mog-0108-bs1271_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/hot-mog-0108-bs1271.yml + description: heat template that creates MOG stack + members: + - abstract_pd_server + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml index 2926457146..51bcd3b538 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml index 0f7eac2983..edf777c2a6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -108,6 +113,10 @@ topology_template: - index_value vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -310,4 +319,4 @@ topology_template: - dependency local_storage_ps_server: - ps_server - - local_storage + - local_storage
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7dbab7d7a4..5df6256ee1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: - type: string + port_pd02_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_order: - type: integer + entry_schema: + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -254,6 +266,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -405,6 +418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index ef595e2f22..a6d46e9b0c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -838,12 +838,11 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,6 +859,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -876,8 +882,6 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml index 00419c0525..f84903c708 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,20 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd02_port_vlan_requirements: + port_pd02_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_image_name: type: string required: true @@ -62,14 +43,53 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c61fde7b6..f185be579f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -72,6 +72,12 @@ node_types: type: string required: true status: SUPPORTED + port_port1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_port1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -151,6 +157,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index c83b3f41fd..2203ab13d0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -125,6 +125,8 @@ topology_template: - RAW vm_image_name: get_input: image_smp_name + port_port1_subinterface_indicator: + - true port_port1_ip_requirements: - ip_version: 4 ip_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml index 6fe26aad39..00a60624cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml @@ -63,6 +63,11 @@ topology_template: vm_image_name: type: string required: true + port_port1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_port1_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -99,6 +104,10 @@ topology_template: - index_value vlan_requirements: get_input: port_port1_vlan_requirements + subinterface_indicator: + get_input: + - port_port1_subinterface_indicator + - index_value ip_requirements: get_input: port_port1_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index dd48197c81..f3f62dafc0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,6 +40,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -64,6 +70,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -278,6 +290,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -429,6 +442,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index cc1fb78d3c..7b63f3c12c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -165,6 +165,8 @@ topology_template: port_pd01_port_security_groups: - - jsa_security_group port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -183,6 +185,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 06a1b7af44..e604ae2ae5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -56,6 +61,11 @@ topology_template: port_pd02_port_network_role: type: string required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -148,26 +158,30 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd01_port_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_mac_requirements + order: + get_input: port_pd01_port_order security_groups: get_input: - port_pd01_port_security_groups - index_value exCP_naming: get_input: port_pd01_port_exCP_naming - replacement_policy: - get_input: - - port_pd01_port_replacement_policy - - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements - order: - get_input: port_pd01_port_order network_role: get_input: port_pd01_port_network_role subnetpoolid: @@ -184,26 +198,30 @@ topology_template: pd_server_pd02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd02_port_replacement_policy + - index_value + mac_requirements: + get_input: port_pd02_port_mac_requirements + order: + get_input: port_pd02_port_order security_groups: get_input: - port_pd02_port_security_groups - index_value exCP_naming: get_input: port_pd02_port_exCP_naming - replacement_policy: - get_input: - - port_pd02_port_replacement_policy - - index_value vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag - mac_requirements: - get_input: port_pd02_port_mac_requirements - order: - get_input: port_pd02_port_order network_role: get_input: port_pd02_port_network_role subnetpoolid: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6731149a49..ad1fe5af08 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -34,6 +34,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd02_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -58,6 +64,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -266,6 +278,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -417,6 +430,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 440984c419..756ee422cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -174,6 +174,8 @@ topology_template: - AUTO vm_flavor_name: get_input: pd_flavor_name + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -192,6 +194,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 928c92c06a..5cf54bac84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -32,6 +32,11 @@ topology_template: port_pd02_port_network_role_tag: type: string required: true + port_pd02_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -51,6 +56,11 @@ topology_template: port_pd02_port_network_role: type: string required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_vlan_requirements: type: list required: true @@ -146,6 +156,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 10c7550905..e31c7e32bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -46,6 +46,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -110,6 +116,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_1_order: type: integer required: true @@ -196,6 +208,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -214,6 +227,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index e87be546a3..e10c369fa3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -176,6 +176,8 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -199,6 +201,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_1_subinterface_indicator: + - true port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index c747cc3d9f..b949593d7d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -42,6 +42,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -93,6 +98,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_1_order: type: integer required: true @@ -148,26 +158,30 @@ topology_template: pd_server_pd01_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd01_port_1_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_1_mac_requirements + order: + get_input: port_pd01_port_1_order security_groups: get_input: - port_pd01_port_1_security_groups - index_value exCP_naming: get_input: port_pd01_port_1_exCP_naming - replacement_policy: - get_input: - - port_pd01_port_1_replacement_policy - - index_value vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: get_input: port_pd01_port_1_network_role_tag - mac_requirements: - get_input: port_pd01_port_1_mac_requirements - order: - get_input: port_pd01_port_1_order network_role: get_input: port_pd01_port_1_network_role subnetpoolid: @@ -184,26 +198,30 @@ topology_template: pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + replacement_policy: + get_input: + - port_pd01_port_0_replacement_policy + - index_value + mac_requirements: + get_input: port_pd01_port_0_mac_requirements + order: + get_input: port_pd01_port_0_order security_groups: get_input: - port_pd01_port_0_security_groups - index_value exCP_naming: get_input: port_pd01_port_0_exCP_naming - replacement_policy: - get_input: - - port_pd01_port_0_replacement_policy - - index_value vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: get_input: port_pd01_port_0_network_role_tag - mac_requirements: - get_input: port_pd01_port_0_mac_requirements - order: - get_input: port_pd01_port_0_order network_role: get_input: port_pd01_port_0_network_role subnetpoolid: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8add335fc5..55cbc86f16 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,6 +40,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -104,6 +110,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_1_order: type: integer required: true @@ -184,6 +196,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -202,6 +215,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 2166dafe83..6b3f264e01 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -205,6 +205,8 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true port_pd01_port_0_replacement_policy: - AUTO vm_flavor_name: @@ -226,6 +228,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_1_subinterface_indicator: + - true port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 7c391c928b..a45b794a03 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_0_replacement_policy: type: list required: true @@ -88,6 +93,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_1_order: type: integer required: true @@ -146,6 +156,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -178,6 +192,10 @@ topology_template: - index_value vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index fd377108d4..76ab87a8b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: - type: string + port_pd02_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_order: - type: integer + entry_schema: + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -254,6 +266,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -405,6 +418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -872,6 +886,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -879,6 +894,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 0feb3e397d..026e8c7ae7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -879,12 +879,11 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -901,6 +900,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -917,8 +923,6 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index 00419c0525..f84903c708 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,20 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd02_port_vlan_requirements: + port_pd02_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_image_name: type: string required: true @@ -62,14 +43,53 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4fd00d5da4..ace7b0798e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,28 +24,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,18 +40,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -78,54 +58,86 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: - type: list + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_network: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd01_port_1_network: + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -172,6 +184,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -190,6 +203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 8ccf970879..d624cc9bf7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -848,29 +848,16 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -878,6 +865,23 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_subinterface_indicator: + - true + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml index 0d10fd3cc9..818ba138cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml @@ -24,24 +24,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true port_pd01_port_0_network_role: type: string required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,46 +37,29 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -105,6 +73,48 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7ddb4b000a..f95dac28ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,24 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd_1_port_0_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_1_port_0_network_role: - type: string - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 port_pd_2_port_1_vlan_requirements: type: list required: true @@ -50,6 +32,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_2_port_1_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_2_port_1_network: type: list required: true @@ -60,10 +48,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd_2_port_1_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_flavor_name: type: string required: true @@ -72,10 +56,12 @@ node_types: type: integer required: true status: SUPPORTED - port_pd_2_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_1_port_0_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -88,28 +74,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_1_port_0_order: - type: integer - required: true - status: SUPPORTED - port_pd_1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED port_pd_1_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_1_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd_2_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pd_2_port_1_ip_requirements: type: list required: true @@ -126,6 +96,48 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_1_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_1_port_0_network_role: + type: string + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_2_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_1_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_1_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -276,6 +288,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -470,6 +483,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml index 195972522d..081c90647f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml @@ -840,10 +840,14 @@ topology_template: - get_input: - pd_server_names - 0 + port_pd_2_port_1_subinterface_indicator: + - true port_pd_2_port_1_network: - get_input: oam_net_name vm_flavor_name: get_input: pd_flavor_name + port_pd_1_port_0_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_pd_1_port_0_mac_requirements: @@ -860,10 +864,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd_1_port_0_network_role_tag: oam - port_pd_2_port_1_mac_requirements: - mac_count_required: - is_required: false port_pd_2_port_1_ip_requirements: - ip_version: 4 ip_count_required: @@ -878,6 +878,10 @@ topology_template: port_pd_2_port_1_network_role_tag: oam compute_pd_server_user_data_format: - RAW + port_pd_1_port_0_network_role_tag: oam + port_pd_2_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml index e8e3a93ee6..6e005d07a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml @@ -16,21 +16,6 @@ topology_template: required: true entry_schema: type: string - port_pd_1_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_1_port_0_network_role: - type: string - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 port_pd_2_port_1_vlan_requirements: type: list required: true @@ -46,6 +31,11 @@ topology_template: required: true entry_schema: type: string + port_pd_2_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_2_port_1_network: type: list required: true @@ -54,18 +44,17 @@ topology_template: port_pd_2_port_1_network_role: type: string required: true - port_pd_2_port_1_subnetpoolid: - type: string - required: true vm_flavor_name: type: string required: true port_pd_2_port_1_order: type: integer required: true - port_pd_2_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_1_port_0_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -75,23 +64,11 @@ topology_template: port_pd_1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd_1_port_0_order: - type: integer - required: true - port_pd_1_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd_1_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd_1_port_0_network_role_tag: - type: string - required: true - port_pd_2_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd_2_port_1_ip_requirements: type: list required: true @@ -105,6 +82,39 @@ topology_template: required: true entry_schema: type: string + port_pd_1_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_1_port_0_network_role: + type: string + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_2_port_1_subnetpoolid: + type: string + required: true + port_pd_2_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_1_port_0_order: + type: integer + required: true + port_pd_1_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_1_port_0_network_role_tag: + type: string + required: true + port_pd_2_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd_2_port_1_exCP_naming vlan_requirements: get_input: port_pd_2_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_2_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_2_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd_1_port_0_exCP_naming vlan_requirements: get_input: port_pd_1_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_1_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_1_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8959f2fece..d5acb4ca67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -22,20 +22,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -56,30 +42,70 @@ node_types: type: integer required: true status: SUPPORTED - port_pd_oam1_port_0_vlan_requirements: + port_pd_oam1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd_oam1_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_pd_oam1_port_1_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_oam1_port_1_network: + type: boolean + port_pd_oam1_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_oam1_port_0_ip_requirements: + type: list required: true status: SUPPORTED - port_pd_oam1_port_1_network_role: - type: string + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_oam1_port_0_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_oam1_port_1_network: + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd_oam1_port_1_subnetpoolid: type: string required: true status: SUPPORTED + port_pd_oam1_port_0_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_oam1_port_0_order: type: integer required: true @@ -94,10 +120,6 @@ node_types: status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string - required: true - status: SUPPORTED port_pd_oam1_port_0_subnetpoolid: type: string required: true @@ -106,10 +128,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd_oam1_port_1_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd_oam1_port_1_vlan_requirements: type: list required: true @@ -120,12 +138,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -534,6 +546,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -541,6 +554,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index 2dd1307517..8728f58f15 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -844,6 +844,24 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 0 + vm_flavor_name: + get_input: pd_flavor_name + port_pd_oam1_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: pd_image_name + port_pd_oam1_port_1_subinterface_indicator: + - true + port_pd_oam1_port_1_network_role_tag: oam + compute_pd_server_user_data_format: + - RAW port_pd_oam1_port_0_ip_requirements: - ip_version: 4 ip_count_required: @@ -855,29 +873,15 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 0 - vm_flavor_name: - get_input: pd_flavor_name port_pd_oam1_port_1_network: - get_input: oam_net_name - port_pd_oam1_port_1_mac_requirements: - mac_count_required: - is_required: false + port_pd_oam1_port_0_subinterface_indicator: + - true port_pd_oam1_port_0_network: - get_input: oam_net_name - vm_image_name: - get_input: pd_image_name - port_pd_oam1_port_1_network_role_tag: oam port_pd_oam1_port_0_mac_requirements: mac_count_required: is_required: false - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml index 105dabef73..ccd2d95f87 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml @@ -22,18 +22,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_pd_oam1_port_0_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_availability_zone: type: list required: true @@ -50,6 +38,40 @@ topology_template: port_pd_oam1_port_1_order: type: integer required: true + port_pd_oam1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_oam1_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_pd_oam1_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd_oam1_port_1_network_role_tag: + type: string + required: true + compute_pd_server_user_data_format: + type: list + required: true + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_oam1_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements port_pd_oam1_port_0_vlan_requirements: type: list required: true @@ -60,15 +82,14 @@ topology_template: required: true entry_schema: type: string - port_pd_oam1_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_oam1_port_1_network_role: - type: string - required: true port_pd_oam1_port_1_subnetpoolid: type: string required: true + port_pd_oam1_port_0_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_oam1_port_0_order: type: integer required: true @@ -80,18 +101,12 @@ topology_template: required: true entry_schema: type: string - vm_image_name: - type: string - required: true port_pd_oam1_port_0_subnetpoolid: type: string required: true port_pd_oam1_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_oam1_port_1_network_role_tag: - type: string - required: true port_pd_oam1_port_1_vlan_requirements: type: list required: true @@ -100,11 +115,6 @@ topology_template: port_pd_oam1_port_0_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd_oam1_port_1_exCP_naming vlan_requirements: get_input: port_pd_oam1_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_oam1_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_oam1_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd_oam1_port_0_exCP_naming vlan_requirements: get_input: port_pd_oam1_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_oam1_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_oam1_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml index 17285f8444..7624e45914 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -28,24 +28,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pd01_port2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,74 +46,98 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port1_subnetpoolid: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port2_subnetpoolid: + port_pd01_port2_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port2_network_role: - type: string + port_pd01_port1_order: + type: integer required: true status: SUPPORTED - vm_flavor_name: + port_pd01_port2_order: + type: integer + required: true + status: SUPPORTED + vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port1_ip_requirements: + port_pd01_port2_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port2_network_role_tag: - type: string + type: boolean + port_pd01_port2_vlan_requirements: + type: list required: true status: SUPPORTED - port_pd01_port1_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pd01_port1_network_role: - type: string + compute_pd_server_user_data_format: + type: list required: true status: SUPPORTED - port_pd01_port2_mac_requirements: + entry_schema: + type: string + port_pd01_port1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port2_order: + index_value: type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port1_subnetpoolid: + type: string required: true status: SUPPORTED - port_pd01_port1_vlan_requirements: + port_pd01_port2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd01_port2_network_role: + type: string + required: true + status: SUPPORTED + port_pd01_port1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port1_network_role: type: string required: true status: SUPPORTED - port_pd01_port2_vlan_requirements: + port_pd01_port2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - compute_pd_server_user_data_format: + port_pd01_port1_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string + type: boolean requirements: - dependency_pd_server_pd01_port1: capability: tosca.capabilities.Node @@ -421,6 +433,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -428,6 +441,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml index 993c99c66f..4dbcf3a644 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml @@ -837,9 +837,6 @@ topology_template: port_pd01_port1_network_role_tag: oam port_pd01_port2_network: - get_input: oam_net_name - port_pd01_port1_mac_requirements: - mac_count_required: - is_required: false port_pd01_port2_ip_requirements: - ip_version: 4 ip_count_required: @@ -859,6 +856,16 @@ topology_template: - 0 vm_flavor_name: get_input: pd_flavor_name + port_pd01_port2_network_role_tag: oam + vm_image_name: + get_input: pd_image_name + port_pd01_port2_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd01_port1_mac_requirements: + mac_count_required: + is_required: false port_pd01_port1_ip_requirements: - ip_version: 4 ip_count_required: @@ -870,14 +877,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port2_network_role_tag: oam port_pd01_port2_mac_requirements: mac_count_required: is_required: false - vm_image_name: - get_input: pd_image_name - compute_pd_server_user_data_format: - - RAW + port_pd01_port1_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml index 20ce78d7f1..1293f8f76d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml @@ -27,21 +27,11 @@ topology_template: required: true entry_schema: type: string - port_pd01_port1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port2_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,59 +42,79 @@ topology_template: required: true entry_schema: type: string - port_pd01_port1_subnetpoolid: + vm_flavor_name: type: string required: true - port_pd01_port2_subnetpoolid: + port_pd01_port2_network_role_tag: type: string required: true - port_pd01_port2_network_role: - type: string + port_pd01_port1_order: + type: integer required: true - vm_flavor_name: + port_pd01_port2_order: + type: integer + required: true + vm_image_name: type: string required: true - port_pd01_port1_ip_requirements: + port_pd01_port2_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port2_network_role_tag: - type: string + type: boolean + port_pd01_port2_vlan_requirements: + type: list required: true - port_pd01_port1_order: - type: integer + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true - port_pd01_port1_network_role: - type: string + compute_pd_server_user_data_format: + type: list required: true - port_pd01_port2_mac_requirements: + entry_schema: + type: string + port_pd01_port1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port2_order: + index_value: type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port1_subnetpoolid: + type: string required: true - port_pd01_port1_vlan_requirements: + port_pd01_port2_subnetpoolid: + type: string + required: true + port_pd01_port2_network_role: + type: string + required: true + port_pd01_port1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port1_network_role: type: string required: true - port_pd01_port2_vlan_requirements: + port_pd01_port2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - compute_pd_server_user_data_format: + port_pd01_port1_subinterface_indicator: type: list required: true entry_schema: - type: string + type: boolean node_templates: pd_server_pd01_port1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -113,6 +123,10 @@ topology_template: get_input: port_pd01_port1_exCP_naming vlan_requirements: get_input: port_pd01_port1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port2_exCP_naming vlan_requirements: get_input: port_pd01_port2_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port2_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port2_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index b46537506a..63428c4dff 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: - type: string + port_pd02_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_order: - type: integer + entry_schema: + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string attributes: pd_server_accessIPv4: type: string @@ -264,6 +276,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -415,6 +428,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index ec2230fbe4..dee35ce88e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -838,12 +838,11 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,6 +859,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -876,8 +882,6 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index a5e8295de3..ff9ab1fa47 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,20 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd02_port_vlan_requirements: + port_pd02_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_image_name: type: string required: true @@ -62,14 +43,53 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4ba9976dee..3053ba7550 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -50,6 +50,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_template_VMInt_OAM_lb_virtual_machine_interface_properties: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true @@ -260,6 +266,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_template_VMInt_OAM_lb_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_template_VMInt_OAM_lb_name: type: list required: true @@ -672,6 +684,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -774,6 +787,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index 0f12e75b18..a8ceff1ec0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -424,6 +424,8 @@ topology_template: is_required: true vm_image_name: get_input: pd_image_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_device_id: - PORT_PD_DEVICE_ID port_pd01_port_admin_state_up: @@ -494,6 +496,8 @@ topology_template: - fq_name port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - get_input: mac_address + port_template_VMInt_OAM_lb_subinterface_indicator: + - true port_template_VMInt_OAM_lb_name: - template_VMInt_OAM_lb_NAME port_pd01_port_port_security_enabled: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index 41ee8c066f..1536b33544 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: vm_image_name: type: string required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_template_VMInt_OAM_lb_virtual_machine_interface_properties: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true @@ -217,6 +222,11 @@ topology_template: required: true entry_schema: type: json + port_template_VMInt_OAM_lb_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_template_VMInt_OAM_lb_name: type: list required: true @@ -359,6 +369,10 @@ topology_template: get_input: - port_template_VMInt_OAM_lb_virtual_machine_interface_properties - index_value + subinterface_indicator: + get_input: + - port_template_VMInt_OAM_lb_subinterface_indicator + - index_value security_group_refs: get_input: - port_template_VMInt_OAM_lb_security_group_refs @@ -427,6 +441,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value qos_policy: get_input: - port_pd01_port_qos_policy diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index d63c125f33..98ef12fa28 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: - type: string + port_pd02_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_order: - type: integer + entry_schema: + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string attributes: pd_server_accessIPv4: type: string @@ -261,6 +273,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -412,6 +425,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index 39d09e007e..9dba82e490 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -838,12 +838,11 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: pd_flavor_name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -860,6 +859,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -876,8 +882,6 @@ topology_template: port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml index 0f136e5c38..acec850677 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,20 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd02_port_vlan_requirements: + port_pd02_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_image_name: type: string required: true @@ -62,14 +43,53 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7dbab7d7a4..5df6256ee1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,14 +8,6 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,60 +20,92 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_flavor_name: + type: string required: true status: SUPPORTED - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd02_port_network_role_tag: + type: string required: true status: SUPPORTED - vm_flavor_name: - type: string + port_pd02_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_order: - type: integer + entry_schema: + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd02_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED - port_pd02_port_network_role_tag: + port_pd01_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd02_port_network_role: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd01_port_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd02_port_vlan_requirements: + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd02_port_order: + type: integer + required: true + status: SUPPORTED + port_pd02_port_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd02_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd02_port_network_role: - type: string - required: true - status: SUPPORTED port_pd01_port_order: type: integer required: true @@ -108,24 +132,12 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -254,6 +266,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -405,6 +418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 5436475c7c..812d77a64e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -838,14 +838,13 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd02_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_attribute: - network_policy_server - name port_pd02_port_network_role_tag: oam + port_pd02_port_subinterface_indicator: + - true port_pd01_port_mac_requirements: mac_count_required: is_required: false @@ -862,6 +861,13 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true + compute_pd_server_user_data_format: + - RAW + port_pd02_port_mac_requirements: + mac_count_required: + is_required: false port_pd01_port_network: - get_attribute: - network_policy_server @@ -879,8 +885,6 @@ topology_template: is_required: false port_pd02_port_network: - get_input: oam_net_name - compute_pd_server_user_data_format: - - RAW service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 00419c0525..f84903c708 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,13 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -28,32 +21,20 @@ topology_template: required: true entry_schema: type: string - port_pd02_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true vm_flavor_name: type: string required: true - port_pd02_port_order: - type: integer - required: true - port_pd02_port_subnetpoolid: - type: string - required: true port_pd02_port_network_role_tag: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd02_port_vlan_requirements: + port_pd02_port_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: boolean + port_pd01_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true vm_image_name: type: string required: true @@ -62,14 +43,53 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + port_pd02_port_network_role: + type: string + required: true + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_pd_server_user_data_format: type: list required: true entry_schema: type: string - port_pd02_port_network_role: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd02_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd02_port_order: + type: integer + required: true + port_pd02_port_subnetpoolid: type: string required: true + port_pd02_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_network: + type: list + required: true + entry_schema: + type: string port_pd01_port_order: type: integer required: true @@ -90,21 +110,11 @@ topology_template: port_pd01_port_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true entry_schema: type: string - compute_pd_server_user_data_format: - type: list - required: true - entry_schema: - type: string node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd02_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4fd00d5da4..ace7b0798e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,28 +24,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,18 +40,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -78,54 +58,86 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: - type: list + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_network: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd01_port_1_network: + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -172,6 +184,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -190,6 +203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 07a63f0802..4af2861395 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -111,30 +111,18 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -142,6 +130,22 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_subinterface_indicator: + - true + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml index 0d10fd3cc9..818ba138cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml @@ -24,24 +24,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true port_pd01_port_0_network_role: type: string required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,46 +37,29 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -105,6 +73,48 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7629f5d14d..ffd4d72a14 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,28 +24,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,18 +40,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -78,54 +58,86 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: - type: list + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_network: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd01_port_1_network: + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: pd_server_accessIPv4: type: string @@ -182,6 +194,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -200,6 +213,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 4927c75677..c8bbec9c07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -848,29 +848,16 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -878,6 +865,23 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_subinterface_indicator: + - true + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index c74bb74310..64e8423103 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -24,24 +24,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true port_pd01_port_0_network_role: type: string required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,46 +37,29 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -105,6 +73,48 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7c21a09074..6d9b66fe62 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,28 +24,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true - status: SUPPORTED port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_1_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -58,18 +40,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED port_pd01_port_1_network_role: type: string required: true @@ -78,54 +58,86 @@ node_types: type: integer required: true status: SUPPORTED - port_pd01_port_1_vlan_requirements: - type: list + port_pd01_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_1_subnetpoolid: + port_pd01_port_1_network_role_tag: type: string required: true status: SUPPORTED - vm_image_name: + port_pd01_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd01_port_1_network: + type: list required: true status: SUPPORTED - port_pd01_port_1_network_role_tag: + entry_schema: + type: string + compute_pd_server_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_0_vlan_requirements: + port_pd01_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_0_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list required: true status: SUPPORTED - port_pd01_port_1_network: + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + status: SUPPORTED + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_user_data_format: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements attributes: pd_server_pd01_port_0_device_id: type: string @@ -182,6 +194,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -200,6 +213,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index a636a190ca..5f7c815eec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -848,29 +848,16 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_0_network_role_tag: oam - port_pd01_port_1_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 + port_pd01_port_0_subinterface_indicator: + - true vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_1_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_1_network_role_tag: oam @@ -878,6 +865,23 @@ topology_template: - get_input: oam_net_name compute_pd_server_user_data_format: - RAW + port_pd01_port_0_network_role_tag: oam + port_pd01_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_1_subinterface_indicator: + - true + port_pd01_port_1_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 54aaaadf4b..f934f60a74 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -24,24 +24,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_0_network_role_tag: - type: string - required: true port_pd01_port_0_network_role: type: string required: true - port_pd01_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 compute_pd_server_availability_zone: type: list required: true @@ -52,46 +37,29 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_1_order: - type: integer + port_pd01_port_0_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true - port_pd01_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role: type: string required: true port_pd01_port_0_order: type: integer required: true - port_pd01_port_1_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd01_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_1_subnetpoolid: type: string required: true vm_image_name: type: string required: true - port_pd01_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true port_pd01_port_1_network_role_tag: type: string required: true - port_pd01_port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_pd01_port_0_subnetpoolid: type: string required: true @@ -105,6 +73,48 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_0_network_role_tag: + type: string + required: true + port_pd01_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_1_order: + type: integer + required: true + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_1_exCP_naming vlan_requirements: get_input: port_pd01_port_1_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_1_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_1_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_0_exCP_naming vlan_requirements: get_input: port_pd01_port_0_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_0_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_0_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index d68f8cb73e..1eadc23a94 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -316,6 +322,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -495,6 +502,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -632,6 +645,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -949,6 +963,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -1017,6 +1037,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index a8802c5e13..6bb5f7a911 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -418,6 +418,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -475,6 +477,8 @@ topology_template: - get_attribute: - network_policy_server - name + port_pd01_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -519,6 +523,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml index 265f7f8dd7..ab73989d32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -94,6 +99,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml index fda77955e2..cb03463f31 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,6 +122,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml index 36ae71b0d3..554ecbf1d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -94,6 +99,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2ef752e55a..7216b0c255 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -470,6 +477,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -597,6 +610,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -902,6 +916,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -963,6 +983,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index 4d291ebe96..e2104837bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -355,6 +355,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -403,6 +405,8 @@ topology_template: - get_attribute: - network_policy_server - name + port_pd01_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 1 @@ -440,6 +444,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true compute_oam_server_user_data_format: - RAW compute_oam_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml index d723dc7db3..38592a2bf8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -80,6 +85,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml index b81ce072c3..cf6052bf9f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -80,6 +85,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 817b61213e..41c744d8b4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -50,6 +50,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -291,6 +297,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -464,6 +471,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -705,6 +718,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -884,6 +898,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -1125,6 +1145,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 693505e75b..f04c8f5787 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -371,6 +371,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -412,6 +414,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -457,6 +461,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml index 76a8b65cea..e360446048 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -94,6 +99,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml index 3a972e27d4..474984e929 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -94,6 +99,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml index 5a33098b0f..e133a985b5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index b75037b55b..0f03728659 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +483,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -717,6 +730,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -856,18 +870,6 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_3_order: - type: integer - required: true - status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 port_pd01_port_2_vlan_requirements: type: list required: true @@ -900,10 +902,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pd01_port_3_network: type: list required: true @@ -926,30 +924,22 @@ node_types: type: string required: true status: SUPPORTED - port_pd01_port_2_network: + port_pd01_port_2_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_3_vlan_requirements: + type: boolean + port_pd01_port_2_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd01_port_3_network_role_tag: - type: string - required: true - status: SUPPORTED compute_pd_server_user_data_format: type: list required: true @@ -962,6 +952,42 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_3_order: + type: integer + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd01_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_3_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_pd01_port_3_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd01_port_3_network_role_tag: + type: string + required: true + status: SUPPORTED port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1028,6 +1054,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1040,6 +1067,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 6fe4e09880..743ce1e834 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -355,6 +355,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -393,19 +395,17 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_3_mac_requirements: - mac_count_required: - is_required: false port_pd01_port_3_network: - get_input: oam_net_name vm_image_name: get_input: pd_image_name + port_pd01_port_2_subinterface_indicator: + - true port_pd01_port_2_network: - get_input: oam_net_name port_pd01_port_2_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network_role_tag: oam compute_pd_server_user_data_format: - RAW port_pd01_port_2_ip_requirements: @@ -419,6 +419,12 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_3_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_3_subinterface_indicator: + - true + port_pd01_port_3_network_role_tag: oam service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -467,6 +473,8 @@ topology_template: - get_attribute: - network_policy_server - name + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml index 7dcab1874c..c5324d5469 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml index 9e80f46126..84b2aec4a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml @@ -17,16 +17,6 @@ topology_template: port_pd01_port_3_network_role: type: string required: true - port_pd01_port_3_order: - type: integer - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 port_pd01_port_2_vlan_requirements: type: list required: true @@ -53,9 +43,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_3_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pd01_port_3_network: type: list required: true @@ -73,25 +60,19 @@ topology_template: port_pd01_port_3_subnetpoolid: type: string required: true - port_pd01_port_2_network: + port_pd01_port_2_subinterface_indicator: type: list required: true entry_schema: - type: string - port_pd01_port_3_vlan_requirements: + type: boolean + port_pd01_port_2_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string port_pd01_port_2_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_2_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd01_port_3_network_role_tag: - type: string - required: true compute_pd_server_user_data_format: type: list required: true @@ -102,6 +83,35 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pd01_port_3_order: + type: integer + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd01_port_3_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_3_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_pd01_port_3_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd01_port_3_network_role_tag: + type: string + required: true port_pd01_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -132,6 +142,10 @@ topology_template: get_input: port_pd01_port_2_exCP_naming vlan_requirements: get_input: port_pd01_port_2_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_2_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_2_ip_requirements network_role_tag: @@ -160,6 +174,10 @@ topology_template: get_input: port_pd01_port_3_exCP_naming vlan_requirements: get_input: port_pd01_port_3_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_3_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index ee557cbfd7..8cef821fd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -301,6 +307,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -472,6 +479,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -792,6 +805,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 821efd557b..683b8bfaee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -711,6 +711,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -737,6 +739,8 @@ topology_template: - RAW vm_flavor_name: get_input: pd_flavor_name + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_attribute: - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 6307a03202..ff163d0573 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml index bb6d0b7219..2109090026 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4ed112bddd..603bceea9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -468,6 +475,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -784,6 +797,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index f752a148f3..70c417d5f4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -709,6 +709,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -735,6 +737,8 @@ topology_template: - RAW vm_flavor_name: get_input: pd_flavor_name + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml index 03c433e0f4..5a5d97e43f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml @@ -44,6 +44,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 461b81cd2f..c30564adad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -34,6 +34,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_vdbe_availability_zone: type: list required: true @@ -238,7 +244,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -436,6 +442,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -655,7 +662,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_untr_vmi_0: + - subinterface_link_vdbe_0_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml index 46d5688f80..447f628beb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml @@ -401,6 +401,8 @@ topology_template: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_vmi_subinterface_indicator: + - true compute_vdbe_availability_zone: - get_input: availability_zone_1 subinterface_nested_service_template_filter_count: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml index cc98b59c72..024ca9a725 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -32,6 +32,11 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_vdbe_availability_zone: type: list required: true @@ -200,6 +205,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_vmi_virtual_network_refs @@ -476,9 +485,6 @@ topology_template: link_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - link - link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - link_vdbe_0_untr_vmi_0 dependency_vdbe_vdbe_untr_vmi_nested: - vdbe_vdbe_untr_vmi_nested - dependency @@ -494,3 +500,6 @@ topology_template: dependency_vdbe: - vdbe - dependency + subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - vdbe_vdbe_untr_vmi_nested + - subinterface_link_vdbe_0_untr_vmi_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml index c45c4d6dcc..2817c54a6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_0_untr_vmi_0 - feature requirements: - link_vdbe_0_untr_vmi_0: - - vdbe_0_untr_vmi_0 - - link dependency_vdbe_0_untr_vmi_0: - vdbe_0_untr_vmi_0 - dependency binding_vdbe_0_untr_vmi_0: - vdbe_0_untr_vmi_0 - binding + subinterface_link_vdbe_0_untr_vmi_0: + - vdbe_0_untr_vmi_0 + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a03266a7b..2b6e88dd48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -52,6 +52,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan2_aap_untrusted_v6_ip_prefix: type: list required: true @@ -190,6 +196,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -410,7 +422,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -430,7 +442,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -644,6 +656,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -798,6 +811,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -934,7 +948,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1046,7 +1060,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index 2f990e6fce..6608ddb811 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -485,6 +485,8 @@ topology_template: get_input: vdbe_flavor_name subinterface_vlan1_counter: - get_input: counter + port_vdbe_untr_2_port_subinterface_indicator: + - true subinterface_vlan2_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix vm_image_name: @@ -520,6 +522,8 @@ topology_template: - get_input: vdbe_name_1 subinterface_vlan2_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_vmac_address: @@ -603,7 +607,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -617,4 +621,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index aa35c77223..4ef1ae6e3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -47,6 +47,11 @@ topology_template: required: true entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan2_aap_untrusted_v6_ip_prefix: type: list required: true @@ -159,6 +164,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -336,6 +346,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -538,6 +552,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -780,12 +798,18 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: - vdbe_vdbe_untr_2_port_vlan2 - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - vdbe_vdbe_untr_2_port_vlan2 + - subinterface_link_vdbe_untr_x_subport_another dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency link_vdbe_vdbe_untr_2_port: - vdbe_vdbe_untr_2_port - link + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage @@ -798,15 +822,9 @@ topology_template: dependency_vdbe_vdbe_untr_1_port_vlan1: - vdbe_vdbe_untr_1_port_vlan1 - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_subport link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: - - vdbe_vdbe_untr_2_port_vlan2 - - link_vdbe_untr_x_subport_another dependency_vdbe: - vdbe - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 33dbb49298..28d80b519e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -156,6 +156,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -333,7 +339,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -366,7 +372,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -543,6 +549,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -793,7 +800,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -905,7 +912,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml index 5b18cab1e9..3ecb94b2fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/MainServiceTemplate.yaml @@ -455,6 +455,8 @@ topology_template: - get_input: vdbe_name_1 subinterface_vlan2_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_vmac_address: @@ -537,4 +539,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml index 6e81017375..3babb153db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml @@ -132,6 +132,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -371,6 +376,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -649,21 +658,21 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: + subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: - vdbe_vdbe_untr_1_port_vlan2 - - link_vdbe_untr_x_subport_another + - subinterface_link_vdbe_untr_x_subport_another dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage dependency_vdbe_vdbe_untr_1_port_vlan1: - vdbe_vdbe_untr_1_port_vlan1 - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port_vlan2: - vdbe_vdbe_untr_1_port_vlan2 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 36c1a97f94..bd94f25284 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -186,6 +186,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -313,7 +319,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -360,7 +366,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -532,6 +538,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -787,7 +794,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml index 6f735b3c54..0516898e7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/MainServiceTemplate.yaml @@ -471,6 +471,8 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: @@ -535,4 +537,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml index 86ece84fdf..721af0f45b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -157,6 +157,11 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -367,6 +372,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -645,24 +654,24 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency dependency_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - - link_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - dependency_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - - link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml index d70a184404..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c474dc6bc..9b8810f3f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1,806 +1,814 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: GlobalSubstitutionTypes
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.abstract.nodes.vdbe:
- derived_from: org.openecomp.resource.abstract.nodes.VFC
- properties:
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- compute_vdbe_availability_zone:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- vm_flavor_name:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- vm_image_name:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- status: SUPPORTED
- compute_vdbe_metadata:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_vdbe_untr_1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- compute_vdbe_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- requirements:
- - dependency_vdbe:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - local_storage_vdbe:
- capability: tosca.capabilities.Attachment
- node: tosca.nodes.BlockStorage
- relationship: tosca.relationships.AttachesTo
- occurrences:
- - 0
- - UNBOUNDED
- - dependency_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- capabilities:
- feature_vdbe:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.iops_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- endpoint_vdbe:
- type: tosca.capabilities.Endpoint.Admin
- occurrences:
- - 1
- - UNBOUNDED
- disk.ephemeral.size_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- cpu_util_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- vcpus_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.requests_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.latency_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.write.requests.rate_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- feature_vdbe_vdbe_untr_1_port:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.bytes.rate_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.bytes.rate_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_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_vdbe:
- type: tosca.capabilities.Scalable
- occurrences:
- - 1
- - UNBOUNDED
- disk.iops_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.write.requests_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.capacity_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.outgoing.bytes_vdbe_vdbe_untr_1_port:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.allocation_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.usage_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- memory.usage_vdbe:
- type: org.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_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.bytes_vdbe_vdbe_untr_1_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_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- cpu.delta_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- binding_vdbe_vdbe_untr_1_port:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
- disk.device.read.bytes.rate_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.write.bytes.rate_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- memory.resident_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- forwarder_vdbe_vdbe_untr_1_port:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.requests.rate_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- cpu_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.bytes_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.usage_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.read.bytes_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.latency_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.capacity_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- host_vdbe:
- type: tosca.capabilities.Container
- valid_source_types:
- - tosca.nodes.SoftwareComponent
- occurrences:
- - 1
- - UNBOUNDED
- disk.allocation_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.outpoing.packets_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_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_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- os_vdbe:
- type: tosca.capabilities.OperatingSystem
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.read.requests_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.root.size_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- memory_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- binding_vdbe:
- type: tosca.capabilities.network.Bindable
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.write.bytes_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.outgoing.bytes.rate_vdbe_vdbe_untr_1_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_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- disk.read.bytes_vdbe:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- org.openecomp.resource.abstract.nodes.heat.nested:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- requirements:
- - dependency_vdbe_untr_x_subport:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_untr_x_subport:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- - binding_vdbe_untr_x_subport:
- capability: tosca.capabilities.network.Bindable
- node: org.openecomp.resource.cp.nodes.network.Port
- relationship: tosca.relationships.network.BindsTo
- occurrences:
- - 1
- - 1
- capabilities:
- feature_vdbe_untr_x_subport:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- org.openecomp.resource.abstract.nodes.heat.nested2:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- org.openecomp.resource.abstract.nodes.heat.nested3:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- requirements:
- - dependency_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- - binding_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.network.Bindable
- relationship: tosca.relationships.network.BindsTo
- occurrences:
- - 1
- - 1
- capabilities:
- forwarder_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
- network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.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_vdbe_untr_x_subport_missing_vlan_tag:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.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_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.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_vdbe_untr_x_subport_missing_vlan_tag:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
- network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.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_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.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 +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.vdbe: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vdbe_untr_1_port_order: + type: integer + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_vdbe_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + compute_vdbe_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_1_port_virtual_network_refs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_vdbe_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + requirements: + - dependency_vdbe: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + endpoint_vdbe: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_util_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + vcpus_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + feature_vdbe_vdbe_untr_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_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_vdbe: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.iops_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.usage_vdbe: + type: org.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_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_1_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_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu.delta_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vdbe_vdbe_untr_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.read.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory.resident_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + forwarder_vdbe_vdbe_untr_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + cpu_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.usage_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.latency_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.capacity_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + host_vdbe: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_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_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + os_vdbe: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.root.size_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + memory_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_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_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + disk.read.bytes_vdbe: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.nested: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_untr_x_subport: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_vdbe_untr_x_subport: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_untr_x_subport: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe_untr_x_subport: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.nested2: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + org.openecomp.resource.abstract.nodes.heat.nested3: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + forwarder_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag: + type: org.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_vdbe_untr_x_subport_missing_vlan_tag: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag: + type: org.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_vdbe_untr_x_subport_missing_vlan_tag: + type: org.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_vdbe_untr_x_subport_missing_vlan_tag: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag: + type: org.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_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml index 78ed2205d4..cb896d4449 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/MainServiceTemplate.yaml @@ -1,542 +1,544 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- vf_module_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id
- type: string
- description: Unique ID for this VF module inst
- control_int_net_rpf:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_rpf
- type: string
- description: Reverse Path Filtering enable or disable for the control virtual network
- control_int_net_forwarding_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_forwarding_mode
- type: string
- description: forwarding mode of the control virtual network
- vnf_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name
- type: string
- description: Unique name for this VF instance
- vdbe_untrusted_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_ip_1
- type: string
- description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_num_vn:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_num_vn
- type: float
- description: Number of vDBE subinterface virtual Networks
- constraints:
- - in_range:
- - 1
- - 77
- aap_address_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: aap_address_mode
- type: string
- description: Address mode for the vDBE cluster IP
- control_int_net_shared:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_shared
- type: boolean
- description: control virtual network shared
- vdbe_untrusted_v6_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_v6_ip_1
- type: string
- description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_untrusted_vmac_address:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_vmac_address
- type: string
- description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
- control_int_net_flood_unknown_unicast:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_flood_unknown_unicast
- type: boolean
- description: forwarding mode of the control virtual network
- vdbe_aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vnf_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id
- type: string
- description: Unique ID for this VF inst
- vdbe_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_1
- type: string
- description: VM Name for this vdbe node 1
- availability_zone_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_1
- type: string
- description: The availability zone of secondary node1 vDBE vm in the local HA pair.
- untrusted_vn_networks:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vn_networks
- type: list
- description: List of subinterface virtual networks
- entry_schema:
- type: string
- vdbe_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_image_name
- type: string
- description: Image to use for vDBE
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: oam_net_name
- type: string
- description: Name of NSDNet network from which the management IP addresses will be allocated
- vdbe_aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix_len
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_vlan_tags:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vlan_tags
- type: list
- description: List of subinterface vlan tags
- entry_schema:
- type: string
- vdbe_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_flavor_name
- type: string
- description: Flavor to use for vDBE
- vdbe_hw_untr_mac_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_hw_untr_mac_1
- type: string
- description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
- untrusted_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_net_name
- type: string
- description: Name of public untrusted network into which this vDBE HA cluster is deployed
- vdbe_device_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_device_name
- type: string
- description: VDBE device Name for this vdbe VNF
- vdbe_aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- node_templates:
- suport_missing_vlan_tag_property:
- type: org.openecomp.resource.abstract.nodes.heat.nested3
- directives:
- - substitutable
- properties:
- aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
- ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- counter: 5
- ip_address:
- get_input: vdbe_untrusted_ip_1
- subinterfaces_name_prefix:
- str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- aap_address_mode:
- get_input: aap_address_mode
- service_template_filter:
- substitute_service_template: nested3ServiceTemplate.yaml
- count:
- get_input: untrusted_num_vn
- mandatory: false
- aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
- parent_interface: vdbe_untr_1_port
- vn_network_list:
- get_input: untrusted_vn_networks
- mac_address:
- get_input: vdbe_hw_untr_mac_1
- vlan_tag_list:
- get_input: untrusted_vlan_tags
- aap_sec_untrusted_ip_prefix_len:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- vmac_address:
- get_input: vdbe_untrusted_vmac_address
- aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- aap_untrusted_ip_prefix_len:
- get_input: vdbe_aap_untrusted_ip_prefix_len
- control_int_net:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_name:
- str_replace:
- template: VNF_NAME_control_net
- params:
- VNF_NAME:
- get_input: vnf_name
- subport_get_param_parent:
- type: org.openecomp.resource.abstract.nodes.heat.nested
- directives:
- - substitutable
- properties:
- aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
- ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- counter: 5
- ip_address:
- get_input: vdbe_untrusted_ip_1
- subinterfaces_name_prefix:
- str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- aap_address_mode:
- get_input: aap_address_mode
- service_template_filter:
- substitute_service_template: nestedServiceTemplate.yaml
- count:
- get_input: untrusted_num_vn
- mandatory: false
- aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
- parent_interface:
- get_input: vdbe_hw_untr_mac_1
- vn_network_list:
- get_input: untrusted_vn_networks
- mac_address:
- get_input: vdbe_hw_untr_mac_1
- vlan_tag_list:
- get_input: untrusted_vlan_tags
- aap_sec_untrusted_ip_prefix_len:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- vmac_address:
- get_input: vdbe_untrusted_vmac_address
- aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- aap_untrusted_ip_prefix_len:
- get_input: vdbe_aap_untrusted_ip_prefix_len
- abstract_vdbe:
- type: org.openecomp.resource.abstract.nodes.vdbe
- directives:
- - substitutable
- properties:
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- vm_flavor_name:
- get_input: vdbe_flavor_name
- port_vdbe_untr_1_port_name:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- vm_image_name:
- get_input: vdbe_image_name
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- port_vdbe_untr_1_port_virtual_network_refs:
- - - control_int_net
- compute_vdbe_name:
- - get_input: vdbe_name_1
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- node: control_int_net
- relationship: tosca.relationships.network.LinksTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - suport_missing_vlan_tag_property
- - control_int_net
- - subport_get_param_parent
- - abstract_vdbe
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + suport_missing_vlan_tag_property: + type: org.openecomp.resource.abstract.nodes.heat.nested3 + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + ip_v6_address: + get_input: vdbe_untrusted_v6_ip_1 + counter: 5 + ip_address: + get_input: vdbe_untrusted_ip_1 + subinterfaces_name_prefix: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + aap_address_mode: + get_input: aap_address_mode + service_template_filter: + substitute_service_template: nested3ServiceTemplate.yaml + count: + get_input: untrusted_num_vn + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + parent_interface: vdbe_untr_1_port + vn_network_list: + get_input: untrusted_vn_networks + mac_address: + get_input: vdbe_hw_untr_mac_1 + vlan_tag_list: + get_input: untrusted_vlan_tags + aap_sec_untrusted_ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + vmac_address: + get_input: vdbe_untrusted_vmac_address + aap_untrusted_v6_ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + aap_untrusted_ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + subport_get_param_parent: + type: org.openecomp.resource.abstract.nodes.heat.nested + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + ip_v6_address: + get_input: vdbe_untrusted_v6_ip_1 + counter: 5 + ip_address: + get_input: vdbe_untrusted_ip_1 + subinterfaces_name_prefix: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + aap_address_mode: + get_input: aap_address_mode + service_template_filter: + substitute_service_template: nestedServiceTemplate.yaml + count: + get_input: untrusted_num_vn + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + parent_interface: + get_input: vdbe_hw_untr_mac_1 + vn_network_list: + get_input: untrusted_vn_networks + mac_address: + get_input: vdbe_hw_untr_mac_1 + vlan_tag_list: + get_input: untrusted_vlan_tags + aap_sec_untrusted_ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + vmac_address: + get_input: vdbe_untrusted_vmac_address + aap_untrusted_v6_ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + aap_untrusted_ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + vm_flavor_name: + get_input: vdbe_flavor_name + port_vdbe_untr_1_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + vm_image_name: + get_input: vdbe_image_name + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + port_vdbe_untr_1_port_virtual_network_refs: + - - control_int_net + compute_vdbe_name: + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - suport_missing_vlan_tag_property + - control_int_net + - subport_get_param_parent + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml index 0b11d60e73..aca6038cfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml @@ -1,319 +1,328 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Nested_vdbe
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.compute.nodes.heat.vdbe:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- compute_vdbe_availability_zone:
- type: list
- required: true
- entry_schema:
- type: string
- port_vdbe_untr_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- vm_flavor_name:
- type: string
- required: true
- port_vdbe_untr_1_port_subnetpoolid:
- type: string
- required: true
- port_vdbe_untr_1_port_name:
- type: list
- required: true
- entry_schema:
- type: string
- vm_image_name:
- type: string
- required: true
- port_vdbe_untr_1_port_network_role:
- type: string
- required: true
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- compute_vdbe_metadata:
- type: list
- required: true
- entry_schema:
- type: json
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
- required: true
- entry_schema:
- type: json
- port_vdbe_untr_1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- compute_vdbe_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role_tag:
- type: string
- required: true
- port_vdbe_untr_1_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- type: list
- required: true
- entry_schema:
- type: json
- node_templates:
- vdbe:
- type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe
- properties:
- availability_zone:
- get_input:
- - compute_vdbe_availability_zone
- - index_value
- flavor:
- get_input: vm_flavor_name
- metadata:
- get_input:
- - compute_vdbe_metadata
- - index_value
- image:
- get_input: vm_image_name
- name:
- get_input:
- - compute_vdbe_name
- - index_value
- vdbe_vdbe_untr_1_port:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- mac_requirements:
- get_input: port_vdbe_untr_1_port_mac_requirements
- order:
- get_input: port_vdbe_untr_1_port_order
- exCP_naming:
- get_input: port_vdbe_untr_1_port_exCP_naming
- virtual_machine_interface_allowed_address_pairs:
- get_input:
- - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs
- - index_value
- vlan_requirements:
- get_input: port_vdbe_untr_1_port_vlan_requirements
- virtual_network_refs:
- get_input:
- - port_vdbe_untr_1_port_virtual_network_refs
- - index_value
- ip_requirements:
- get_input: port_vdbe_untr_1_port_ip_requirements
- network_role_tag:
- get_input: port_vdbe_untr_1_port_network_role_tag
- virtual_machine_interface_mac_addresses:
- get_input:
- - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses
- - index_value
- network_role:
- get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
- name:
- get_input:
- - port_vdbe_untr_1_port_name
- - index_value
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vdbe
- relationship: tosca.relationships.network.BindsTo
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.vdbe
- capabilities:
- feature_vdbe:
- - vdbe
- - feature
- disk.device.iops_vdbe:
- - vdbe
- - disk.device.iops
- endpoint_vdbe:
- - vdbe
- - endpoint
- disk.ephemeral.size_vdbe:
- - vdbe
- - disk.ephemeral.size
- cpu_util_vdbe:
- - vdbe
- - cpu_util
- vcpus_vdbe:
- - vdbe
- - vcpus
- disk.write.requests_vdbe:
- - vdbe
- - disk.write.requests
- disk.device.latency_vdbe:
- - vdbe
- - disk.device.latency
- disk.device.write.requests.rate_vdbe:
- - vdbe
- - disk.device.write.requests.rate
- feature_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - feature
- disk.write.bytes.rate_vdbe:
- - vdbe
- - disk.write.bytes.rate
- network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.bytes.rate
- network.incoming.packets.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.packets.rate
- scalable_vdbe:
- - vdbe
- - scalable
- disk.iops_vdbe:
- - vdbe
- - disk.iops
- disk.device.write.requests_vdbe:
- - vdbe
- - disk.device.write.requests
- disk.device.capacity_vdbe:
- - vdbe
- - disk.device.capacity
- network.outgoing.bytes_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.bytes
- disk.device.allocation_vdbe:
- - vdbe
- - disk.device.allocation
- disk.usage_vdbe:
- - vdbe
- - disk.usage
- memory.usage_vdbe:
- - vdbe
- - memory.usage
- disk.read.requests_vdbe:
- - vdbe
- - disk.read.requests
- network.incoming.bytes_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.bytes
- instance_vdbe:
- - vdbe
- - instance
- cpu.delta_vdbe:
- - vdbe
- - cpu.delta
- binding_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - binding
- disk.device.read.bytes.rate_vdbe:
- - vdbe
- - disk.device.read.bytes.rate
- disk.device.write.bytes.rate_vdbe:
- - vdbe
- - disk.device.write.bytes.rate
- memory.resident_vdbe:
- - vdbe
- - memory.resident
- forwarder_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - forwarder
- disk.write.requests.rate_vdbe:
- - vdbe
- - disk.write.requests.rate
- cpu_vdbe:
- - vdbe
- - cpu
- disk.write.bytes_vdbe:
- - vdbe
- - disk.write.bytes
- disk.device.usage_vdbe:
- - vdbe
- - disk.device.usage
- disk.device.read.bytes_vdbe:
- - vdbe
- - disk.device.read.bytes
- disk.latency_vdbe:
- - vdbe
- - disk.latency
- network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.packets.rate
- disk.capacity_vdbe:
- - vdbe
- - disk.capacity
- host_vdbe:
- - vdbe
- - host
- disk.allocation_vdbe:
- - vdbe
- - disk.allocation
- network.outpoing.packets_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outpoing.packets
- network.incoming.packets_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.packets
- disk.read.bytes.rate_vdbe:
- - vdbe
- - disk.read.bytes.rate
- os_vdbe:
- - vdbe
- - os
- disk.device.read.requests_vdbe:
- - vdbe
- - disk.device.read.requests
- disk.root.size_vdbe:
- - vdbe
- - disk.root.size
- memory_vdbe:
- - vdbe
- - memory
- binding_vdbe:
- - vdbe
- - binding
- disk.device.write.bytes_vdbe:
- - vdbe
- - disk.device.write.bytes
- network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.bytes.rate
- disk.device.read.requests.rate_vdbe:
- - vdbe
- - disk.device.read.requests.rate
- disk.read.bytes_vdbe:
- - vdbe
- - disk.read.bytes
- requirements:
- dependency_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - dependency
- local_storage_vdbe:
- - vdbe
- - local_storage
- link_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - link
- dependency_vdbe:
- - vdbe
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_vdbe +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.compute.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vdbe_untr_1_port_order: + type: integer + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_vdbe_availability_zone: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + port_vdbe_untr_1_port_name: + type: list + required: true + entry_schema: + type: string + vm_image_name: + type: string + required: true + port_vdbe_untr_1_port_network_role: + type: string + required: true + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + compute_vdbe_metadata: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + node_templates: + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_1_port: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_1_port_mac_requirements + order: + get_input: port_vdbe_untr_1_port_order + exCP_naming: + get_input: port_vdbe_untr_1_port_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.vdbe + capabilities: + feature_vdbe: + - vdbe + - feature + disk.device.iops_vdbe: + - vdbe + - disk.device.iops + endpoint_vdbe: + - vdbe + - endpoint + disk.ephemeral.size_vdbe: + - vdbe + - disk.ephemeral.size + cpu_util_vdbe: + - vdbe + - cpu_util + vcpus_vdbe: + - vdbe + - vcpus + disk.write.requests_vdbe: + - vdbe + - disk.write.requests + disk.device.latency_vdbe: + - vdbe + - disk.device.latency + disk.device.write.requests.rate_vdbe: + - vdbe + - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - feature + disk.write.bytes.rate_vdbe: + - vdbe + - disk.write.bytes.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.packets.rate + scalable_vdbe: + - vdbe + - scalable + disk.iops_vdbe: + - vdbe + - disk.iops + disk.device.write.requests_vdbe: + - vdbe + - disk.device.write.requests + disk.device.capacity_vdbe: + - vdbe + - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.bytes + disk.device.allocation_vdbe: + - vdbe + - disk.device.allocation + disk.usage_vdbe: + - vdbe + - disk.usage + memory.usage_vdbe: + - vdbe + - memory.usage + disk.read.requests_vdbe: + - vdbe + - disk.read.requests + network.incoming.bytes_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.bytes + instance_vdbe: + - vdbe + - instance + cpu.delta_vdbe: + - vdbe + - cpu.delta + binding_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - binding + disk.device.read.bytes.rate_vdbe: + - vdbe + - disk.device.read.bytes.rate + disk.device.write.bytes.rate_vdbe: + - vdbe + - disk.device.write.bytes.rate + memory.resident_vdbe: + - vdbe + - memory.resident + forwarder_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - forwarder + disk.write.requests.rate_vdbe: + - vdbe + - disk.write.requests.rate + cpu_vdbe: + - vdbe + - cpu + disk.write.bytes_vdbe: + - vdbe + - disk.write.bytes + disk.device.usage_vdbe: + - vdbe + - disk.device.usage + disk.device.read.bytes_vdbe: + - vdbe + - disk.device.read.bytes + disk.latency_vdbe: + - vdbe + - disk.latency + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.packets.rate + disk.capacity_vdbe: + - vdbe + - disk.capacity + host_vdbe: + - vdbe + - host + disk.allocation_vdbe: + - vdbe + - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outpoing.packets + network.incoming.packets_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.packets + disk.read.bytes.rate_vdbe: + - vdbe + - disk.read.bytes.rate + os_vdbe: + - vdbe + - os + disk.device.read.requests_vdbe: + - vdbe + - disk.device.read.requests + disk.root.size_vdbe: + - vdbe + - disk.root.size + memory_vdbe: + - vdbe + - memory + binding_vdbe: + - vdbe + - binding + disk.device.write.bytes_vdbe: + - vdbe + - disk.device.write.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.bytes.rate + disk.device.read.requests.rate_vdbe: + - vdbe + - disk.device.read.requests.rate + disk.read.bytes_vdbe: + - vdbe + - disk.read.bytes + requirements: + dependency_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - dependency + local_storage_vdbe: + - vdbe + - local_storage + link_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - link + dependency_vdbe: + - vdbe + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml index 55f11b0c86..7dc9c41d48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml @@ -1,198 +1,198 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested3
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- virtual_machine_interface_properties_sub_interface_vlan_tag_INVALID:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- - get_input: mac_address
- groups:
- nested3_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested3.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport_missing_vlan_tag
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested3
- capabilities:
- forwarder_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - forwarder
- network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.bytes.rate
- network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.packets.rate
- feature_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - feature
- network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outpoing.packets
- network.outgoing.packets.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.packets.rate
- binding_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - binding
- network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.bytes
- network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.bytes.rate
- network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.packets
- network.incoming.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.bytes
- requirements:
- dependency_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - dependency
- binding_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - binding
- link_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - link
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested3 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + virtual_machine_interface_properties_sub_interface_vlan_tag_INVALID: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + - get_input: mac_address + groups: + nested3_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested3.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport_missing_vlan_tag + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested3 + capabilities: + forwarder_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - forwarder + network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.bytes.rate + network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.packets.rate + feature_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - feature + network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outpoing.packets + network.outgoing.packets.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.packets.rate + binding_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - binding + network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.bytes.rate + network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.packets + network.incoming.bytes_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.bytes + requirements: + dependency_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - dependency + binding_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - binding + link_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nestedServiceTemplate.yaml index 933718ff73..6a94e0dd58 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2fafd8e615..9bf67731bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -217,7 +223,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -406,6 +412,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml index d1dcbbf7a5..7eb63dbfcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -1,485 +1,487 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- vf_module_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id
- type: string
- description: Unique ID for this VF module inst
- control_int_net_rpf:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_rpf
- type: string
- description: Reverse Path Filtering enable or disable for the control virtual network
- control_int_net_forwarding_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_forwarding_mode
- type: string
- description: forwarding mode of the control virtual network
- vnf_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name
- type: string
- description: Unique name for this VF instance
- vdbe_untrusted_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_ip_1
- type: string
- description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_num_vn:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_num_vn
- type: float
- description: Number of vDBE subinterface virtual Networks
- constraints:
- - in_range:
- - 1
- - 77
- aap_address_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: aap_address_mode
- type: string
- description: Address mode for the vDBE cluster IP
- control_int_net_shared:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_shared
- type: boolean
- description: control virtual network shared
- vdbe_untrusted_v6_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_v6_ip_1
- type: string
- description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_untrusted_vmac_address:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_vmac_address
- type: string
- description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
- control_int_net_flood_unknown_unicast:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_flood_unknown_unicast
- type: boolean
- description: forwarding mode of the control virtual network
- vdbe_aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vnf_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id
- type: string
- description: Unique ID for this VF inst
- vdbe_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_1
- type: string
- description: VM Name for this vdbe node 1
- availability_zone_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_1
- type: string
- description: The availability zone of secondary node1 vDBE vm in the local HA pair.
- untrusted_vn_networks:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vn_networks
- type: list
- description: List of subinterface virtual networks
- entry_schema:
- type: string
- vdbe_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_image_name
- type: string
- description: Image to use for vDBE
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: oam_net_name
- type: string
- description: Name of NSDNet network from which the management IP addresses will be allocated
- vdbe_aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix_len
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_vlan_tags:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vlan_tags
- type: list
- description: List of subinterface vlan tags
- entry_schema:
- type: string
- vdbe_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_flavor_name
- type: string
- description: Flavor to use for vDBE
- vdbe_hw_untr_mac_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_hw_untr_mac_1
- type: string
- description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
- untrusted_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_net_name
- type: string
- description: Name of public untrusted network into which this vDBE HA cluster is deployed
- vdbe_device_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_device_name
- type: string
- description: VDBE device Name for this vdbe VNF
- vdbe_aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- node_templates:
- control_int_net:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_name:
- str_replace:
- template: VNF_NAME_control_net
- params:
- VNF_NAME:
- get_input: vnf_name
- abstract_vdbe:
- type: org.openecomp.resource.abstract.nodes.vdbe
- directives:
- - substitutable
- properties:
- subinterface_nested_parent_interface:
- - vdbe_untr_1_port
- subinterface_nested_aap_address_mode:
- - get_input: aap_address_mode
- subinterface_nested_vlan_tag_list:
- - get_input: untrusted_vlan_tags
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- subinterface_nested_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- vm_flavor_name:
- get_input: vdbe_flavor_name
- subinterface_nested_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- vm_image_name:
- get_input: vdbe_image_name
- subinterface_nested_aap_sec_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- subinterface_nested_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- subinterface_nested_aap_untrusted_v6_ip_prefix:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- subinterface_nested_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- port_vdbe_untr_1_port_virtual_network_refs:
- - - control_int_net
- subinterface_nested_ip_address:
- - get_input: vdbe_untrusted_ip_1
- subinterface_nested_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_nested_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- subinterface_nested_vn_network_list:
- - get_input: untrusted_vn_networks
- port_vdbe_untr_1_port_name:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- subinterface_nested_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_nested_counter:
- - 5
- subinterface_nested_subinterfaces_name_prefix:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- compute_vdbe_name:
- - get_input: vdbe_name_1
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- node: control_int_net
- relationship: tosca.relationships.network.LinksTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - control_int_net
- - abstract_vdbe
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true + subinterface_nested_parent_interface: + - vdbe_untr_1_port + subinterface_nested_aap_address_mode: + - get_input: aap_address_mode + subinterface_nested_vlan_tag_list: + - get_input: untrusted_vlan_tags + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + subinterface_nested_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + vm_flavor_name: + get_input: vdbe_flavor_name + subinterface_nested_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + vm_image_name: + get_input: vdbe_image_name + subinterface_nested_aap_sec_untrusted_ip_prefix_len: + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_nested_aap_untrusted_v6_ip_prefix: + - get_input: vdbe_aap_untrusted_v6_ip_prefix + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + subinterface_nested_mac_address: + - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_virtual_network_refs: + - - control_int_net + subinterface_nested_ip_address: + - get_input: vdbe_untrusted_ip_1 + subinterface_nested_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + subinterface_nested_vmac_address: + - get_input: vdbe_untrusted_vmac_address + subinterface_nested_vn_network_list: + - get_input: untrusted_vn_networks + port_vdbe_untr_1_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + subinterface_nested_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested_counter: + - 5 + subinterface_nested_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - control_int_net + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index 827c922afb..41bb064ee0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -285,6 +290,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -476,9 +485,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/nestedServiceTemplate.yaml index d70a184404..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5d85386b2e..ecc78109cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -220,7 +226,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -409,6 +415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -663,7 +670,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -681,4 +688,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml index 8d011527ba..5ffc4e1449 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml @@ -471,6 +471,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -551,7 +553,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -572,4 +574,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_nested_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_nested_aap_address_mode diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml index 940545c2ff..70e19420b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -281,6 +286,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -487,9 +496,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency @@ -507,4 +516,4 @@ topology_template: - link dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index de27b5c0ad..30a4aec6a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -217,7 +223,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -406,6 +412,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml index 4f37a1b570..3232218d9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml @@ -473,6 +473,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -553,7 +555,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -567,4 +569,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml index 9951fc5f56..ae5bb90ea4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -286,6 +291,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -477,9 +486,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 94a9c4a79c..0f685b46e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -211,7 +217,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -400,6 +406,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -655,7 +662,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index a53ca751c4..199571e7df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -395,6 +395,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -473,7 +475,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -490,4 +492,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml index dffc2344bd..5edce41701 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -282,6 +287,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -473,9 +482,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43b1e55eff..95f99fc457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -603,6 +610,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -660,7 +673,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -955,6 +968,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1015,4 +1029,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml index 885ae52726..0ea4a68d1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -775,6 +777,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 9bec8b6463..ae47cfa092 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -341,12 +350,12 @@ topology_template: dependency_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - dependency - link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_1 dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_1 dependency_template_Vlan_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + - dependency_template_Vlan_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml index d05d3f6aca..cbe6b147ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -54,6 +54,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -329,6 +338,9 @@ topology_template: - ps_server_ps01_port - network.outgoing.bytes requirements: + subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - ps_server_ps01_port_nested + - subinterface_link_template_Vlan_1 dependency_ps_server: - ps_server - dependency @@ -344,9 +356,6 @@ topology_template: dependency_template_Vlan_1_ps_server_ps01_port_nested: - ps_server_ps01_port_nested - dependency_template_Vlan_1 - link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - link_template_Vlan_1 local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml index a82a0563f8..7f0188fcfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -111,9 +111,9 @@ topology_template: dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: + subinterface_link_template_Vlan_1: - template_Vlan_1 - - link + - subinterface_link binding_template_Vlan_1: - template_Vlan_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml index a839d67cc1..d6fa3c4559 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -488,6 +495,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -537,7 +550,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -765,6 +778,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -949,7 +963,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -967,4 +981,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml index 57be376a5d..3284aad2f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -734,6 +734,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -780,6 +782,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -794,7 +798,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -808,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43b1e55eff..95f99fc457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -603,6 +610,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -660,7 +673,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -955,6 +968,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1015,4 +1029,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml index 5f16f354ab..bb8c2a7214 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -736,6 +736,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -750,7 +752,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -771,6 +773,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -801,7 +805,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml index e54889ba0f..8a4a553505 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -138,6 +143,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -340,12 +349,12 @@ topology_template: dependency_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - dependency - link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_1 dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_1 dependency_template_Vlan_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + - dependency_template_Vlan_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml index d90ee86983..dd03ca0248 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -54,6 +54,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -138,6 +143,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -328,6 +337,9 @@ topology_template: - ps_server_ps01_port - network.outgoing.bytes requirements: + subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - ps_server_ps01_port_nested + - subinterface_link_template_Vlan_1 dependency_ps_server: - ps_server - dependency @@ -343,9 +355,6 @@ topology_template: dependency_template_Vlan_1_ps_server_ps01_port_nested: - ps_server_ps01_port_nested - dependency_template_Vlan_1 - link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - link_template_Vlan_1 local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml index a82a0563f8..7f0188fcfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -111,9 +111,9 @@ topology_template: dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: + subinterface_link_template_Vlan_1: - template_Vlan_1 - - link + - subinterface_link binding_template_Vlan_1: - template_Vlan_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 62d9868dd6..eb19ee1ea8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +423,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -536,6 +543,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -585,7 +598,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -813,6 +826,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -997,7 +1011,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1015,4 +1029,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml index d18b63d88b..4c70e386ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml @@ -720,6 +720,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 6a798fde3e..66c054bc84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -49,6 +49,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -120,6 +125,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -329,9 +338,6 @@ topology_template: - pd_server - disk.device.iops requirements: - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - link_template_Vlan_vmi_1 local_storage_pd_server: - pd_server - local_storage @@ -347,6 +353,9 @@ topology_template: dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - pd_server_ps01_port_nested + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_ps01_port_nested: - pd_server_ps01_port_nested - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index a839d67cc1..d6fa3c4559 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -488,6 +495,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -537,7 +550,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -765,6 +778,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -949,7 +963,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -967,4 +981,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml index 57be376a5d..3284aad2f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml @@ -734,6 +734,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -780,6 +782,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -794,7 +798,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -808,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index de6dfcddfa..4840c96647 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,12 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -32,12 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -52,38 +40,22 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string + type: boolean vm_image_name: type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_network_role: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_2_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_network_role: type: string required: true @@ -100,12 +72,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json port_vdbe_untr_1_port_ip_requirements: type: list required: true @@ -122,130 +88,176 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true status: SUPPORTED - subinterface_vlan1_service_template_filter_count: + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + subinterface_vlan1_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + subinterface_vlan1_ip_address: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vlan1_parent_interface: + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_address_mode: + type: boolean + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_2_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true status: SUPPORTED - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + port_vdbe_untr_2_port_order: + type: integer + required: true + status: SUPPORTED + subinterface_vlan1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + subinterface_vlan1_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_vlan1_optional_property_2: + type: list required: true status: SUPPORTED - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string + port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED port_vdbe_untr_1_port_vlan_requirements: @@ -312,7 +324,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -521,6 +533,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -670,6 +683,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -817,7 +831,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -835,4 +849,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml index 24ed331aca..30ee294d8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml @@ -476,49 +476,25 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix - subinterface_vlan1_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - subinterface_vlan1_aap_untrusted_ip_prefix: - - get_input: vdbe_aap_untrusted_ip_prefix - - get_input: vdbe_aap_untrusted_ip_prefix port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_counter: - get_input: counter - get_input: counter - subinterface_vlan1_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 + port_vdbe_untr_2_port_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -535,6 +511,48 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + subinterface_vlan1_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_vlan1_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_vlan1_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true + subinterface_vlan1_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + subinterface_vlan1_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_2_port_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net + subinterface_vlan1_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_name: + - Port_2 + - Port_4 port_vdbe_untr_1_port_virtual_network_refs: - - control_int_net - - control_int_net @@ -574,18 +592,6 @@ topology_template: subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - subinterface_vlan1_mac_address: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 - subinterface_vlan1_aap_untrusted_ip_prefix_len: - - get_input: vdbe_aap_untrusted_ip_prefix_len - - get_input: vdbe_aap_untrusted_ip_prefix_len - subinterface_vlan1_ip_address: - - get_input: vdbe_untrusted_ip_1 - - get_input: vdbe_untrusted_ip_1 - compute_vdbe_name: - - get_input: vdbe_name_1 - - get_input: vdbe_name_1 port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 @@ -609,7 +615,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -634,4 +640,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml index d751754ae5..eb21b34ada 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml @@ -16,11 +16,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,11 +26,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -47,32 +37,19 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true entry_schema: - type: string + type: boolean vm_image_name: type: string required: true - port_vdbe_untr_1_port_network_role: - type: string - required: true - port_vdbe_untr_2_port_name: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_network_role: type: string required: true @@ -86,11 +63,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json port_vdbe_untr_1_port_ip_requirements: type: list required: true @@ -104,107 +76,145 @@ topology_template: port_vdbe_untr_2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true - subinterface_vlan1_service_template_filter_count: + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + subinterface_vlan1_mac_address: type: list required: true entry_schema: - type: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer + type: string + subinterface_vlan1_ip_address: + type: list required: true - subinterface_vlan1_parent_interface: + entry_schema: + type: string + compute_vdbe_name: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_address_mode: + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_network_role: + type: string + required: true + port_vdbe_untr_2_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + port_vdbe_untr_2_port_order: + type: integer + required: true + subinterface_vlan1_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_vlan1_parent_interface: type: list required: true entry_schema: type: string - subinterface_vlan1_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_vlan1_optional_property_2: + type: list required: true - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string + port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true port_vdbe_untr_1_port_vlan_requirements: type: list @@ -256,6 +266,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -385,6 +399,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -637,9 +655,9 @@ topology_template: link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f32192a6f..a2a3bc67dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -210,6 +210,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -330,6 +336,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -391,7 +403,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -437,7 +449,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -619,6 +631,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -692,6 +705,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -929,7 +943,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1041,7 +1055,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1: + - subinterface_link_vdbe_1_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1059,4 +1073,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index c973648470..1e7c8c88c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -581,6 +581,9 @@ topology_template: subinterface_vlan2_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address + port_vdbe_untr_vmi_subinterface_indicator: + - true + - true subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -650,6 +653,9 @@ topology_template: subinterface_vlan2_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_oam_vmi_subinterface_indicator: + - true + - true subinterface_vlan2_service_template_filter_count: - 5 - 5 @@ -676,7 +682,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -712,4 +718,4 @@ topology_template: get_input: oam_vfc_instance_group_function subinterface_role: oam members: - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index e256c4fd7c..2bb75a89ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -176,6 +176,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -275,6 +280,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -417,6 +427,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_vmi_virtual_network_refs @@ -457,6 +471,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_oam_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_oam_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_oam_vmi_virtual_network_refs @@ -768,12 +786,18 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - vdbe_vdbe_untr_vmi_vlan1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - link dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - vdbe_vdbe_untr_vmi_vlan1 - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - vdbe_vdbe_oam_vmi_vlan2 + - subinterface_link_vdbe_1_subint_oam_vmi_1 dependency_vdbe_vdbe_oam_vmi: - vdbe_vdbe_oam_vmi - dependency @@ -786,9 +810,6 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - dependency @@ -801,6 +822,3 @@ topology_template: dependency_vdbe: - vdbe - dependency - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - link_vdbe_1_subint_oam_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index ef5f4913e8..a8b78bf267 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index 2fcab81b61..4cc2faab29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_1_subint_oam_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_1_subint_oam_vmi_1 - feature requirements: - link_vdbe_1_subint_oam_vmi_1: - - vdbe_1_subint_oam_vmi_1 - - link dependency_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - dependency + subinterface_link_vdbe_1_subint_oam_vmi_1: + - vdbe_1_subint_oam_vmi_1 + - subinterface_link binding_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - - binding
\ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cd031a3f6..bebd463f09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -244,7 +250,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -405,6 +411,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_int_vmi_subport: + - subinterface_link_vdbe_untr_x_int_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -679,4 +686,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml index e8d9805915..1d4530863a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -545,6 +545,9 @@ topology_template: subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address @@ -606,4 +609,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml index e3c02e0545..2f44c0c8a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -205,6 +210,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -489,12 +498,12 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_int_vmi_subport + - subinterface_link_vdbe_untr_x_int_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml index b5d5fad9f2..6a0c7f642e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_int_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_int_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - feature
- requirements:
- binding_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - binding
- dependency_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - dependency
- link_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - link
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_int_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_int_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - subinterface_link + binding_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - binding + dependency_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index b4f43f271c..36046c5423 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -52,6 +52,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -142,6 +148,12 @@ node_types: type: string required: true status: SUPPORTED + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -314,7 +326,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -523,6 +535,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -672,6 +685,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -819,7 +833,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -837,4 +851,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml index 649026024e..ef8138edae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml @@ -488,6 +488,9 @@ topology_template: subinterface_vlan1_counter: - get_input: counter - get_input: counter + port_vdbe_untr_2_port_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name compute_vdbe_metadata: @@ -518,6 +521,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -617,4 +623,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml index 407cd60118..e2bf61738b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml @@ -47,6 +47,11 @@ topology_template: required: true entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -119,6 +124,11 @@ topology_template: port_vdbe_untr_1_port_network_role_tag: type: string required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -261,6 +271,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -390,6 +404,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -635,9 +653,9 @@ topology_template: link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6d9770bd53..25b57c6b4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -256,7 +262,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +423,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -683,7 +690,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -701,4 +708,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml index 6fd7b7bc24..bb61d9e082 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -1,609 +1,612 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- control_int_net_rpf:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_rpf
- type: string
- description: Reverse Path Filtering enable or disable for the control virtual network
- control_int_net_forwarding_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_forwarding_mode
- type: string
- description: forwarding mode of the control virtual network
- vnf_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_1
- type: string
- description: Unique name for this VF instance
- vnf_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_2
- type: string
- description: Unique name for this VF instance
- vnf_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name
- type: string
- description: Unique name for this VF instance
- vdbe_untrusted_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_ip_1
- type: string
- description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- vnf_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_1
- type: string
- description: Unique ID for this VF inst
- vnf_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_2
- type: string
- description: Unique ID for this VF inst
- untrusted_num_vn:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_num_vn
- type: float
- description: Number of vDBE subinterface virtual Networks
- constraints:
- - in_range:
- - 1
- - 77
- aap_address_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: aap_address_mode
- type: string
- description: Address mode for the vDBE cluster IP
- control_int_net_shared:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_shared
- type: boolean
- description: control virtual network shared
- vdbe_untrusted_v6_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_v6_ip_1
- type: string
- description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_untrusted_vmac_address:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_vmac_address
- type: string
- description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
- control_int_net_flood_unknown_unicast:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_flood_unknown_unicast
- type: boolean
- description: forwarding mode of the control virtual network
- vdbe_aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_1
- type: string
- description: VM Name for this vdbe node 1
- availability_zone_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_1
- type: string
- description: The availability zone of secondary node1 vDBE vm in the local HA pair.
- availability_zone_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_2
- type: string
- description: The availability zone of secondary node2 vDBE vm in the local HA pair.
- untrusted_vn_networks:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vn_networks
- type: list
- description: List of subinterface virtual networks
- entry_schema:
- type: string
- vdbe_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_image_name
- type: string
- description: Image to use for vDBE
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: oam_net_name
- type: string
- description: Name of NSDNet network from which the management IP addresses will be allocated
- vdbe_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_2
- type: string
- description: VM Name for this vdbe node 2
- vdbe_aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix_len
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_vlan_tags:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vlan_tags
- type: list
- description: List of subinterface vlan tags
- entry_schema:
- type: string
- vdbe_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_flavor_name
- type: string
- description: Flavor to use for vDBE
- counter:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: counter
- type: float
- description: Counter.
- vf_module_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_2
- type: string
- description: Unique ID for this VF module inst
- vf_module_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_1
- type: string
- description: Unique ID for this VF module inst
- vdbe_hw_untr_mac_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_hw_untr_mac_1
- type: string
- description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
- untrusted_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_net_name
- type: string
- description: Name of public untrusted network into which this vDBE HA cluster is deployed
- vdbe_device_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_device_name
- type: string
- description: VDBE device Name for this vdbe VNF
- vdbe_aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- node_templates:
- control_int_net:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_name:
- str_replace:
- template: VNF_NAME_control_net
- params:
- VNF_NAME:
- get_input: vnf_name
- abstract_vdbe:
- type: org.openecomp.resource.abstract.nodes.vdbe
- directives:
- - substitutable
- properties:
- subinterface_nested_parent_interface:
- - vdbe_untr_port_1
- - vdbe_untr_port_2
- subinterface_nested_aap_address_mode:
- - get_input: aap_address_mode
- - get_input: aap_address_mode
- subinterface_nested_vlan_tag_list:
- - get_input: untrusted_vlan_tags
- - get_input: untrusted_vlan_tags
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- - get_input: availability_zone_2
- subinterface_nested_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- vm_flavor_name:
- get_input: vdbe_flavor_name
- subinterface_nested_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- - get_input: vdbe_aap_untrusted_ip_prefix
- vm_image_name:
- get_input: vdbe_image_name
- subinterface_nested_aap_sec_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- subinterface_nested_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- subinterface_nested_aap_untrusted_v6_ip_prefix:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id_1
- vnf_id:
- get_input: vnf_id_1
- vnf_name:
- get_input: vnf_name_1
- - vf_module_id:
- get_input: vf_module_id_2
- vnf_id:
- get_input: vnf_id_2
- vnf_name:
- get_input: vnf_name_2
- subinterface_nested_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_ip_address:
- - get_input: vdbe_untrusted_ip_1
- - get_input: vdbe_untrusted_ip_1
- port_vdbe_untr_port_virtual_network_refs:
- - - control_int_net
- - - control_int_net
- subinterface_nested_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_nested_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- - get_input: vdbe_untrusted_vmac_address
- subinterface_nested_vn_network_list:
- - get_input: untrusted_vn_networks
- - get_input: untrusted_vn_networks
- port_vdbe_untr_port_name:
- - Untr_Port_1
- - Untr_Port_2
- port_vdbe_untr_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- - - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_nested_counter:
- - 5
- - get_input: counter
- subinterface_nested_subinterfaces_name_prefix:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- compute_vdbe_name:
- - get_input: vdbe_name_1
- - get_input: vdbe_name_2
- subinterface_nested_optional_property_1:
- - OPTIONAL_VALUE_SUBPORT_1
- - null
- subinterface_nested_optional_property_2:
- - null
- - OPTIONAL_VALUE_SUBPORT_2
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_port:
- capability: tosca.capabilities.network.Linkable
- node: control_int_net
- relationship: tosca.relationships.network.LinksTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - control_int_net
- - abstract_vdbe
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_1 + type: string + description: Unique name for this VF instance + vnf_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_2 + type: string + description: Unique name for this VF instance + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + vnf_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_1 + type: string + description: Unique ID for this VF inst + vnf_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_2 + type: string + description: Unique ID for this VF inst + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + availability_zone_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_2 + type: string + description: The availability zone of secondary node2 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_2 + type: string + description: VM Name for this vdbe node 2 + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + counter: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: counter + type: float + description: Counter. + vf_module_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_2 + type: string + description: Unique ID for this VF module inst + vf_module_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_1 + type: string + description: Unique ID for this VF module inst + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + subinterface_nested_parent_interface: + - vdbe_untr_port_1 + - vdbe_untr_port_2 + subinterface_nested_aap_address_mode: + - get_input: aap_address_mode + - get_input: aap_address_mode + subinterface_nested_vlan_tag_list: + - get_input: untrusted_vlan_tags + - get_input: untrusted_vlan_tags + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + - get_input: availability_zone_2 + subinterface_nested_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + vm_flavor_name: + get_input: vdbe_flavor_name + subinterface_nested_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + - get_input: vdbe_aap_untrusted_ip_prefix + vm_image_name: + get_input: vdbe_image_name + subinterface_nested_aap_sec_untrusted_ip_prefix_len: + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_nested_aap_untrusted_v6_ip_prefix: + - get_input: vdbe_aap_untrusted_v6_ip_prefix + - get_input: vdbe_aap_untrusted_v6_ip_prefix + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id_1 + vnf_id: + get_input: vnf_id_1 + vnf_name: + get_input: vnf_name_1 + - vf_module_id: + get_input: vf_module_id_2 + vnf_id: + get_input: vnf_id_2 + vnf_name: + get_input: vnf_name_2 + subinterface_nested_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_port_virtual_network_refs: + - - control_int_net + - - control_int_net + subinterface_nested_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true + subinterface_nested_vmac_address: + - get_input: vdbe_untrusted_vmac_address + - get_input: vdbe_untrusted_vmac_address + subinterface_nested_vn_network_list: + - get_input: untrusted_vn_networks + - get_input: untrusted_vn_networks + port_vdbe_untr_port_name: + - Untr_Port_1 + - Untr_Port_2 + port_vdbe_untr_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested_counter: + - 5 + - get_input: counter + subinterface_nested_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + - get_input: vdbe_name_2 + subinterface_nested_optional_property_1: + - OPTIONAL_VALUE_SUBPORT_1 + - null + subinterface_nested_optional_property_2: + - null + - OPTIONAL_VALUE_SUBPORT_2 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_port: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - control_int_net + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index fccec4c2d6..aa3c3edb2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -215,6 +220,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -497,15 +506,15 @@ topology_template: dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport link_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - link local_storage_vdbe: - vdbe - local_storage + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - vdbe_vdbe_untr_port_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency @@ -514,4 +523,4 @@ topology_template: - dependency dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml index 893a3affe9..b3ed933cb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_vlan1-Network-Role_vmi_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml index 79521b41ef..b0e8e5605b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -547,4 +554,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml index 42bef9d1e1..17c0960ed1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net2 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml index f0bd1b0f9f..25932a5bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 79521b41ef..b0e8e5605b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -547,4 +554,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml index 1333f6d508..10e3bf99af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -809,7 +813,7 @@ topology_template: capability: tosca.capabilities.Node node: test_net2 relationship: tosca.relationships.DependsOn - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -823,4 +827,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index f0bd1b0f9f..25932a5bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml index b4b3551fe6..9bf67731bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -217,7 +223,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -406,6 +412,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -679,4 +686,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 4ef81bd2ab..e13c18f644 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -399,6 +399,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port_1 subinterface_nested_aap_address_mode: @@ -496,6 +498,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port_2 subinterface_nested_aap_address_mode: @@ -586,4 +590,4 @@ topology_template: members: - control_int_net - abstract_vdbe_0 - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml index ab5c047d48..bd02fe09f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -286,6 +291,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -477,9 +486,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency @@ -497,4 +506,4 @@ topology_template: - link dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml index adfc50fa23..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - - binding
\ No newline at end of file + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9519211757..6d4ef6aded 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -233,7 +233,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -387,6 +387,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -677,7 +678,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml index b00d4ff9b0..33f746f7f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml @@ -537,9 +537,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency @@ -552,6 +549,9 @@ topology_template: dependency_control_int_net: - control_int_net - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index b09b4912db..85193db9a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -426,7 +426,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -637,6 +637,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -870,6 +871,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -972,7 +974,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml index 5e7c106f67..7b355eacb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml @@ -291,7 +291,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -773,9 +773,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_untr_2_port: - vdbe_untr_2_port - dependency @@ -797,6 +794,9 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6fb9d6fcdc..8c18eb81b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -329,7 +329,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -370,7 +370,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -534,6 +534,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -824,7 +825,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml index 6fb26941d5..72af3e6093 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml @@ -600,15 +600,12 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport - link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - - vdbe_untr_2_subports - - link_vdbe_untr_x_subport_another dependency_vdbe_node_1: - vdbe_node_1 - dependency + subinterface_link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: + - vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport_another local_storage_vdbe_node_1: - vdbe_node_1 - local_storage @@ -621,6 +618,9 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9940fbc87c..2e140acb39 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -217,7 +217,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -258,7 +258,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +417,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -712,7 +713,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml index cda86a3cb1..7bda071fa2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml @@ -603,15 +603,9 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency - link_vdbe_untr_x_subport_vdbe_untr_2_subports: - - vdbe_untr_2_subports - - link_vdbe_untr_x_subport local_storage_vdbe_node_1: - vdbe_node_1 - local_storage @@ -624,6 +618,12 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_untr_2_subports: + - vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 06202fdceb..cc7798570c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -233,7 +233,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -387,6 +387,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -677,7 +678,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml index c8d738c951..d3bf9d737e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml @@ -530,9 +530,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency @@ -545,6 +542,9 @@ topology_template: dependency_control_int_net: - control_int_net - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 03719b01a0..60cbbcf06c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -427,6 +427,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -727,7 +728,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml index cf14a263ce..0f42e66438 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml @@ -365,7 +365,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6cdd023b1c..15e649a2cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -422,6 +422,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -722,7 +723,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml index 61dc383ac9..d92dab440e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml @@ -365,7 +365,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0e0805f1d6..5d10b6a6ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -381,6 +381,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -671,7 +672,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml index 256a363dc8..66689e8228 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml @@ -330,7 +330,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 14560c5b1a..11ab827c9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -236,6 +236,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -773,6 +774,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -820,6 +822,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -863,6 +866,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1109,6 +1113,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1129,6 +1139,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd_server_2b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_2b_port_network_role: type: string required: true @@ -1189,7 +1205,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1308,6 +1324,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1402,6 +1419,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1662,6 +1680,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_2b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_2b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1688,6 +1712,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2058,6 +2088,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2175,6 +2206,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2226,7 +2258,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2244,4 +2276,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml index c993f98370..21bc68dae8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -94,6 +94,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -110,6 +115,11 @@ topology_template: port_pd_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd_server_2b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_2b_port_network_role: type: string required: true @@ -139,30 +149,34 @@ topology_template: pd_server_1b_pd_server_2b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_2b_port_exCP_naming replacement_policy: get_input: - port_pd_server_2b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_2b_port_mac_requirements + order: + get_input: port_pd_server_2b_port_order + exCP_naming: + get_input: port_pd_server_2b_port_exCP_naming vlan_requirements: get_input: port_pd_server_2b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_2b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_2b_port_ip_requirements network_role_tag: get_input: port_pd_server_2b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_2b_port_mac_requirements - order: - get_input: port_pd_server_2b_port_order network_role: get_input: port_pd_server_2b_port_network_role - subnetpoolid: - get_input: port_pd_server_2b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_2b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_2b_port_subnetpoolid network: get_input: - port_pd_server_2b_port_network @@ -215,30 +229,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -453,9 +471,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -474,9 +489,12 @@ topology_template: dependency_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 link_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 5e299594b7..1ed349aea4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_2b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_2b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -67,6 +72,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -139,30 +149,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -175,30 +189,34 @@ topology_template: ps_server_1b_ps_server_2b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_2b_port_exCP_naming replacement_policy: get_input: - port_ps_server_2b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_2b_port_mac_requirements + order: + get_input: port_ps_server_2b_port_order + exCP_naming: + get_input: port_ps_server_2b_port_exCP_naming vlan_requirements: get_input: port_ps_server_2b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_2b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_2b_port_ip_requirements network_role_tag: get_input: port_ps_server_2b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_2b_port_mac_requirements - order: - get_input: port_ps_server_2b_port_order network_role: get_input: port_ps_server_2b_port_network_role - subnetpoolid: - get_input: port_ps_server_2b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_2b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_2b_port_subnetpoolid network: get_input: - port_ps_server_2b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml index 280080ab55..469540fa5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml @@ -162,11 +162,15 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_subinterface_indicator: + - true port_pd_server_1b_port_replacement_policy: - AUTO port_pd_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_pd_server_2b_port_subinterface_indicator: + - true port_pd_server_1b_port_network: - packet_internal_network port_pd_server_2b_port_replacement_policy: @@ -184,7 +188,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -223,6 +227,8 @@ topology_template: get_input: - ps_server_2b_ips - 0 + port_ps_server_2b_port_subinterface_indicator: + - true compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -232,6 +238,8 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_network: - packet_internal_network port_ps_server_1b_port_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 03622d2261..5833433c36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -699,6 +699,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -794,6 +795,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -928,6 +930,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1019,7 +1027,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1127,6 +1135,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1573,6 +1582,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1932,7 +1942,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1950,4 +1960,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index a5d84b3e51..a55e067b96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -111,6 +111,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -155,7 +157,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index a3c9870391..85b75c7544 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: parent_interface: ps_server_1b_port_1 net1: packet_ext_network requirements: - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -401,4 +401,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8d11461838..d7ea458bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -938,6 +938,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -969,6 +970,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1081,6 +1083,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1285,6 +1288,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1376,7 +1385,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1484,6 +1493,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1882,6 +1892,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1931,6 +1942,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2581,6 +2593,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2694,7 +2712,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3028,6 +3046,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3084,7 +3103,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3102,4 +3121,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 9b9b379f8d..cac0be9063 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -141,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index d02dbd04aa..3d8089b03b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -88,6 +88,9 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 + port_ps_server_1b_port_subinterface_indicator: + - true + - true port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: @@ -157,7 +160,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7a7adb6d58..0f730fd451 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -122,7 +122,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_0: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -149,7 +149,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -286,6 +286,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -695,6 +696,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -859,6 +861,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -950,7 +958,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1058,6 +1066,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1432,7 +1441,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_1: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1680,6 +1689,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1836,7 +1846,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1854,4 +1864,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml index 1c675f2a9a..94cd51451e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml @@ -75,11 +75,11 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_test_resourceGroup_0: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index 9a647881e5..4c68f250a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -120,6 +120,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - get_input: sub_inf_net vm_image_name: @@ -505,21 +507,18 @@ topology_template: - test_nested_level2 - disk.write.requests_server_1b_pd_1 requirements: - link_template_Vlan_vmi_1_test_resourceGroup_0: - - test_resourceGroup_0 - - link_template_Vlan_vmi_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - dependency_pd_server_1b_pd_server_1b_port - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - - test_nested_level2 - - link_template_Vlan_vmi_1_test_resourceGroup_1 dependency_server_1b_pd_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_pd_1 link_pd_server_1b_port_0: - abstract_pd_server_1b - link_pd_server_1b_pd_server_1b_port + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: + - test_resourceGroup_0 + - subinterface_link_template_Vlan_vmi_1 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 @@ -544,6 +543,9 @@ topology_template: dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - test_nested_level2 - dependency_template_Vlan_vmi_1_test_resourceGroup_1 + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - test_nested_level2 + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1 dependency_test_nested_level2: - test_nested_level2 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 29959579c9..019e6cf76e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -357,15 +357,15 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - link_template_Vlan_vmi_1_test_resourceGroup_1: - - test_resourceGroup_1 - - link_template_Vlan_vmi_1 dependency_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - dependency_template_Vlan_vmi_1 local_storage_server_1b_pd_1: - server_1b_pd_1 - local_storage + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1: + - test_resourceGroup_1 + - subinterface_link_template_Vlan_vmi_1 link_pd_server_1b_port_1: - pd_server_1b_port_1 - link @@ -374,4 +374,4 @@ topology_template: - dependency dependency_pd_server_1b_port_1: - pd_server_1b_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 418a181568..f671973941 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,6 +32,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -123,7 +129,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -231,6 +237,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -692,6 +699,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -699,6 +707,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1187,6 +1196,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1215,6 +1225,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2017,6 +2028,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -2184,6 +2201,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2441,6 +2459,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2554,7 +2578,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2888,6 +2912,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2944,7 +2969,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2962,4 +2987,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index a5bb292d55..b788e6b5d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -139,6 +139,11 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true + - true + - true subinterface_nested_vlan_net1: - packet_externalmain_network - packet_externalmain_network @@ -240,7 +245,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internalmain_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 53bc450834..71c4d654a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index d0798c5e1f..f3ebc433f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index e6bbdf5a12..f5055f4147 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -102,6 +102,9 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -180,6 +183,9 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 + port_ps_server_1b_port_subinterface_indicator: + - true + - true port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: @@ -249,7 +255,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index f0406ad372..974e584ce7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -706,6 +706,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -719,6 +720,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -889,6 +891,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -980,7 +988,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1088,6 +1096,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1384,7 +1393,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1402,4 +1411,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 5ad77ff461..a8f96e268e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -121,6 +121,9 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true subinterface_nested_vlan_net1: - packet_external_network - packet_external_network @@ -184,7 +187,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index b1b333cfe3..1387e5c045 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -919,6 +919,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -950,6 +951,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1062,6 +1064,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1261,6 +1264,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1352,7 +1361,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1460,6 +1469,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1844,6 +1854,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1893,6 +1904,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2527,6 +2539,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2937,6 +2955,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2959,6 +2978,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -3072,7 +3097,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3406,6 +3431,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3462,7 +3488,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3480,4 +3506,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml index 6c67ea7a33..fa14eab377 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -303,4 +312,4 @@ topology_template: - link dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 61161a6def..93a58633fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -141,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 4b1d400f33..11197a9d69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -85,6 +85,8 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -138,6 +140,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -185,7 +189,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8333788d1d..1e5a598b9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -938,6 +938,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -969,6 +970,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1081,6 +1083,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1285,6 +1288,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1376,7 +1385,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1484,6 +1493,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1882,6 +1892,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1931,6 +1942,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2581,6 +2593,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2694,7 +2712,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3033,6 +3051,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3084,7 +3103,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1: + - subinterface_link_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3102,4 +3121,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 7187e41f74..a429c0a6ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -350,12 +359,12 @@ topology_template: dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_subint_Vlan_vmi_1 + - subinterface_link_template_subint_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - dependency dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + - dependency_template_subint_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index c76668e78a..bda2ced2cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -353,9 +362,9 @@ topology_template: dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_subint_Vlan_vmi_1 + subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - dependency - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_subint_Vlan_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index e87ea3632f..16338954ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -103,6 +103,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -147,7 +149,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -782,4 +784,4 @@ topology_template: - dependency dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 794867eb95..cb809d0edf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -83,6 +83,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -130,7 +132,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -154,6 +156,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 19 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -201,7 +205,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -621,4 +625,4 @@ topology_template: - dependency_ps_server_1b dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + - dependency_template_subint_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml index bbb740fc75..e15370ab96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_subint_Vlan_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -103,9 +103,9 @@ topology_template: binding_template_subint_Vlan_vmi_1: - template_subint_Vlan_vmi_1 - binding + subinterface_link_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 + - subinterface_link dependency_template_subint_Vlan_vmi_1: - template_subint_Vlan_vmi_1 - dependency - link_template_subint_Vlan_vmi_1: - - template_subint_Vlan_vmi_1 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml index 97718e0f5a..bd4018ecbe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -18,22 +18,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: type: list required: true @@ -78,12 +62,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: type: list required: true @@ -134,154 +112,182 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_subinterface_indicator: + type: list required: true status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - subinterface_vdbe_untr_1_subports_parent_interface: + entry_schema: + type: boolean + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_service_template_filter_count: + port_vdbe_untr_port_name: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + status: SUPPORTED + subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vdbe_untr_1_subports_vn_network_list: + type: string + subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: + subinterface_vdbe_untr_2_subports_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_vlan_requirements: + subinterface_vdbe_untr_2_subports_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - subinterface_vdbe_untr_2_subports_ip_address: + type: string + subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vdbe_untr_1_subports_vmac_address: + entry_schema: + type: string + subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_vn_network_list: + port_vdbe_untr_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: + type: org.openecomp.datatypes.network.IpRequirements + subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + type: json + subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_ip_v6_address: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_mac_address: + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + subinterface_vdbe_untr_1_subports_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_2_subports_parent_interface: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vdbe_untr_2_subports_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_name: + subinterface_vdbe_untr_1_subports_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_ip_requirements: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_vdbe_untr_1_subports_vlan_tag_list: + type: string + subinterface_vdbe_untr_2_subports_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string requirements: - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: capability: tosca.capabilities.Node @@ -297,7 +303,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -317,7 +323,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -515,6 +521,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -776,7 +783,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -794,4 +801,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index e7c838afe1..225bfdf8c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -416,10 +416,6 @@ topology_template: properties: subinterface_vdbe_untr_1_subports_ip_address: - get_input: vdbe_untrusted_ip_1 - subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - - get_input: vdbe_aap_untrusted_ip_prefix - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix: @@ -434,8 +430,6 @@ topology_template: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_vdbe_untr_1_subports_mac_address: - get_input: vdbe_hw_untr_mac_1 - subinterface_vdbe_untr_1_subports_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -463,15 +457,8 @@ topology_template: - get_input: aap_address_mode subinterface_vdbe_untr_2_subports_vlan_tag_list: - get_input: untrusted_vlan_tags - port_vdbe_untr_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_vdbe_untr_1_subports_parent_interface: - - vdbe_1_untr_port_1 - subinterface_vdbe_untr_2_subports_service_template_filter_count: - - 5 - subinterface_vdbe_untr_1_subports_service_template_filter_count: - - get_input: untrusted_num_vn + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks port_vdbe_untr_port_name: @@ -482,34 +469,16 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - subinterface_vdbe_untr_2_subports_ip_address: - - get_input: vdbe_untrusted_ip_1 - subinterface_vdbe_untr_1_subports_vmac_address: - - get_input: vdbe_untrusted_vmac_address - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vdbe_untr_2_subports_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: - - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_vdbe_untr_2_subports_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vdbe_untr_2_subports_mac_address: - get_input: vdbe_hw_untr_mac_1 subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: - - get_input: vdbe_aap_untrusted_ip_prefix_len - subinterface_vdbe_untr_2_subports_parent_interface: - - vdbe_1_untr_port_1 compute_vdbe_name: - get_input: vdbe_name_1 subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: @@ -529,6 +498,39 @@ topology_template: is_required: false subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + subinterface_vdbe_untr_1_subports_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_mac_requirements: + mac_count_required: + is_required: false + subinterface_vdbe_untr_1_subports_parent_interface: + - vdbe_1_untr_port_1 + subinterface_vdbe_untr_2_subports_service_template_filter_count: + - 5 + subinterface_vdbe_untr_1_subports_service_template_filter_count: + - get_input: untrusted_num_vn + subinterface_vdbe_untr_2_subports_ip_address: + - get_input: vdbe_untrusted_ip_1 + subinterface_vdbe_untr_1_subports_vmac_address: + - get_input: vdbe_untrusted_vmac_address + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_vdbe_untr_2_subports_parent_interface: + - vdbe_1_untr_port_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -557,4 +559,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml index c5e13a106c..8ca8da6bcd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml @@ -19,19 +19,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: type: list required: true @@ -68,11 +55,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: type: list required: true @@ -114,129 +96,152 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_subinterface_indicator: + type: list required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - subinterface_vdbe_untr_1_subports_parent_interface: + entry_schema: + type: boolean + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_service_template_filter_count: + port_vdbe_untr_port_name: type: list required: true entry_schema: - type: float - subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true entry_schema: - type: float - subinterface_vdbe_untr_1_subports_vn_network_list: + type: string + subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_name: + subinterface_vdbe_untr_2_subports_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_vlan_requirements: + subinterface_vdbe_untr_2_subports_mac_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - subinterface_vdbe_untr_2_subports_ip_address: + type: string + subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - subinterface_vdbe_untr_1_subports_vmac_address: + compute_vdbe_name: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_vn_network_list: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: + port_vdbe_untr_port_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + type: org.openecomp.datatypes.network.IpRequirements + subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true entry_schema: - type: string - subinterface_vdbe_untr_2_subports_ip_v6_address: + type: json + subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_mac_address: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + subinterface_vdbe_untr_1_subports_parent_interface: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_parent_interface: + subinterface_vdbe_untr_2_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vdbe_untr_2_subports_ip_address: type: list required: true entry_schema: type: string - compute_vdbe_name: + subinterface_vdbe_untr_1_subports_vmac_address: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_ip_requirements: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_vdbe_untr_1_subports_vlan_tag_list: + type: string + subinterface_vdbe_untr_2_subports_parent_interface: type: list required: true entry_schema: - type: json + type: string node_templates: vdbe_vdbe_untr_port_vdbe_untr_1_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested @@ -427,6 +432,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -623,9 +632,6 @@ topology_template: - vdbe_vdbe_untr_port - network.incoming.packets.rate requirements: - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency @@ -635,21 +641,24 @@ topology_template: dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_port_vdbe_untr_1_subports - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_vdbe_untr_1_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_port_vdbe_untr_2_subports - dependency_vdbe_0_subint_untr_vmi_0 local_storage_vdbe: - vdbe - local_storage - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_port_vdbe_untr_1_subports - dependency_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_port_vdbe_untr_2_subports - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_vdbe_untr_2_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml index 172b9c8d2c..a5bdcb8491 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8088898fbb..7294ba02a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,6 +128,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -228,7 +234,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -394,6 +400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -650,7 +657,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -668,4 +675,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 69c79c3e42..592b1b6f85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -445,6 +445,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: @@ -547,6 +549,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: @@ -614,4 +618,4 @@ topology_template: subinterface_role: untr members: - abstract_vdbe_0 - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 16381420bd..71097c0ac2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -109,6 +109,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -184,6 +189,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -467,12 +476,12 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - link_vdbe_0_subint_untr_vmi_0 + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml index 172b9c8d2c..a5bdcb8491 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index e937a9e6bd..3a33693986 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -280,6 +280,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -671,7 +672,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_1: + - subinterface_link_vdbe_0_subint_untr_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -689,4 +690,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index 94f7b2fa25..5475604538 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -107,4 +107,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml index 2ba36df895..19a79dc96d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml @@ -330,7 +330,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_0_subint_untr_vmi_1: + - subinterface_link_vdbe_0_subint_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -558,4 +558,4 @@ topology_template: - dependency dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml index 94e55fe70a..623f1a4db8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_0_subint_untr_vmi_1 - feature requirements: + subinterface_link_vdbe_0_subint_untr_vmi_1: + - vdbe_0_subint_untr_vmi_1 + - subinterface_link dependency_vdbe_0_subint_untr_vmi_1: - vdbe_0_subint_untr_vmi_1 - dependency binding_vdbe_0_subint_untr_vmi_1: - vdbe_0_subint_untr_vmi_1 - binding - link_vdbe_0_subint_untr_vmi_1: - - vdbe_0_subint_untr_vmi_1 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7485e0dd99..134a235a05 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_oam_vmi_0: + - subinterface_link_vdbe_0_subint_oam_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -234,6 +234,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -307,7 +313,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -500,6 +506,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -756,7 +763,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -874,6 +881,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -971,7 +984,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1159,6 +1172,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1326,4 +1340,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 0e805a44b4..f96351357a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -458,6 +458,8 @@ topology_template: is_required: false subinterface_nested2_ip_address: - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true port_vdbe_untr_port_name: - str_replace: template: VM_NAMEDBE001p1n004 @@ -554,6 +556,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true port_vdbe_untr_port_name: - str_replace: template: VM_NAMEDBE001p1n004 @@ -625,4 +629,4 @@ topology_template: get_input: oam_vfc_instance_group_function subinterface_role: oam members: - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 4b5ef9d76d..c74aa04dcd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -104,6 +104,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -261,6 +266,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -451,12 +460,12 @@ topology_template: - vdbe_vdbe_untr_port - network.incoming.packets.rate requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - vdbe_vdbe_untr_port_nested1 - dependency_vdbe_0_subint_untr_vmi_0 @@ -471,4 +480,4 @@ topology_template: - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml index be49ab843c..d75abde655 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -89,6 +89,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -265,6 +270,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -461,12 +470,12 @@ topology_template: dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - vdbe_vdbe_untr_port_nested2 - dependency_vdbe_0_subint_oam_vmi_0 + subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - subinterface_link_vdbe_0_subint_oam_vmi_0 link_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - link - link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - link_vdbe_0_subint_oam_vmi_0 local_storage_vdbe: - vdbe - local_storage @@ -475,4 +484,4 @@ topology_template: - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml index a76b5cd74f..83279c502b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml index 96062a3999..82957d9e8a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_oam_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - dependency - link_vdbe_0_subint_oam_vmi_0: + subinterface_link_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - - link + - subinterface_link binding_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml index acb2ecf5ea..8838d445ef 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -345,6 +345,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -817,6 +818,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -824,6 +826,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -843,6 +846,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -856,6 +860,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -863,6 +868,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -870,6 +876,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -877,6 +884,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -884,6 +892,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1959,6 +1968,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1971,6 +1981,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2410,6 +2421,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2417,6 +2429,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2728,6 +2741,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4ae2e898e9..6325b01c19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -400,6 +400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +477,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -563,6 +565,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -570,6 +573,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1655,6 +1659,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1731,6 +1736,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2394,6 +2400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2713,6 +2720,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3360,6 +3368,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3367,6 +3376,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3442,6 +3452,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3857,6 +3868,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3930,6 +3942,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4616,6 +4629,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5300,6 +5314,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5313,6 +5328,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6097,6 +6113,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6186,6 +6203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6679,6 +6697,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6686,6 +6705,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7055,4 +7075,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 0f15ce0877..7c442c719e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -423,6 +423,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -430,6 +431,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -788,4 +790,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4ae2e898e9..6325b01c19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -400,6 +400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +477,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -563,6 +565,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -570,6 +573,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1655,6 +1659,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1731,6 +1736,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2394,6 +2400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2713,6 +2720,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3360,6 +3368,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3367,6 +3376,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3442,6 +3452,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3857,6 +3868,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3930,6 +3942,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4616,6 +4629,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5300,6 +5314,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5313,6 +5328,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6097,6 +6113,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6186,6 +6203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6679,6 +6697,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6686,6 +6705,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7055,4 +7075,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 377175e2b2..1bfad56b1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -301,6 +301,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -391,4 +392,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 377175e2b2..1bfad56b1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -301,6 +301,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -391,4 +392,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4ae2e898e9..6325b01c19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -400,6 +400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +477,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -563,6 +565,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -570,6 +573,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1655,6 +1659,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1731,6 +1736,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2394,6 +2400,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2713,6 +2720,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3360,6 +3368,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3367,6 +3376,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3442,6 +3452,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3857,6 +3868,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3930,6 +3942,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4616,6 +4629,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5300,6 +5314,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -5313,6 +5328,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6097,6 +6113,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6186,6 +6203,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6679,6 +6697,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -6686,6 +6705,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -7055,4 +7075,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 2d6cfe6cb6..b3513603cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -370,6 +370,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -377,6 +378,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -735,4 +737,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 2d6cfe6cb6..b3513603cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -370,6 +370,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -377,6 +378,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -735,4 +737,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index f22b830e3a..d479c9d3b0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -296,6 +296,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -386,4 +387,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index bc281b6a89..6bfcf8a462 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -206,6 +206,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -698,6 +699,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -723,6 +725,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -977,6 +980,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1214,4 +1218,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 65dfbb42dc..0e98ccf58e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -348,6 +348,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -360,6 +361,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -469,4 +471,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index e7801f0522..533227bf63 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -527,6 +527,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -599,6 +600,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1250,6 +1252,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1309,6 +1312,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1334,6 +1338,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1394,6 +1399,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1642,6 +1648,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2115,6 +2122,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2140,6 +2148,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2633,6 +2642,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2732,6 +2742,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2773,6 +2784,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2959,6 +2971,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3302,6 +3315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3401,6 +3415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3704,6 +3719,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3751,6 +3767,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4279,6 +4296,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4298,6 +4316,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4419,4 +4438,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 7636e73b4b..ee0284fa1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -206,6 +206,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -698,6 +699,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -723,6 +725,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1129,6 +1132,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1214,4 +1218,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 6445858558..a79a69e7ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -487,6 +487,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -535,6 +536,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -607,6 +609,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1257,6 +1260,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1316,6 +1320,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1352,6 +1357,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1412,6 +1418,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2115,6 +2122,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2140,6 +2148,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2633,6 +2642,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2732,6 +2742,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2773,6 +2784,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2959,6 +2971,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3302,6 +3315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3401,6 +3415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3704,6 +3719,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3751,6 +3767,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4279,6 +4296,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4298,6 +4316,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4419,4 +4438,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 1192e314a9..d479c9d3b0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -296,6 +296,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index a8416b7f21..5464f9c545 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -224,6 +224,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -364,6 +365,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -371,6 +373,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -831,4 +834,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d7f5ae6fc1..0f2251372d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -254,6 +254,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -314,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -343,6 +345,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -467,6 +470,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -540,6 +544,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -547,6 +552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1262,6 +1268,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1612,6 +1619,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2176,6 +2184,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2183,6 +2192,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2218,6 +2228,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2472,6 +2483,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2533,6 +2545,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2912,6 +2925,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3538,6 +3552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3551,6 +3566,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3687,6 +3703,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3835,6 +3852,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4407,6 +4425,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4426,6 +4445,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4506,4 +4526,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4d8b9ab2f7..0d9d098942 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -461,6 +461,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -473,6 +474,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -951,6 +953,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -975,6 +978,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -992,6 +996,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1666,6 +1671,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1685,6 +1691,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1887,6 +1894,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2377,6 +2385,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2390,6 +2399,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2687,6 +2697,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2713,4 +2724,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 12f2859d97..5e603825ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -404,6 +404,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -416,6 +417,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -435,6 +437,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -556,4 +559,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 836201fb98..62c5e12e4f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -357,6 +357,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -364,6 +365,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -473,4 +475,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d7f5ae6fc1..0f2251372d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -254,6 +254,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -314,6 +315,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -343,6 +345,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -467,6 +470,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -540,6 +544,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -547,6 +552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1262,6 +1268,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1612,6 +1619,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2176,6 +2184,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2183,6 +2192,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2218,6 +2228,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2472,6 +2483,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2533,6 +2545,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2912,6 +2925,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3538,6 +3552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3551,6 +3566,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3687,6 +3703,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -3835,6 +3852,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4407,6 +4425,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4426,6 +4445,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -4506,4 +4526,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index f302b3f6ac..6cf8ddeb64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -356,6 +356,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -363,6 +364,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -472,4 +474,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. 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/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index 4cf19dbc60..4920397c09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml index 1b925e3e8e..64646166d8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/MainServiceTemplate.yaml @@ -502,7 +502,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml index 01fd719787..d833cb6e65 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/inoutattr/expectedoutputfiles/nestedServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_subint_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency - binding_vdbe_0_subint_untr_vmi_0: + subinterface_link_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - - binding - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link + binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file + - binding
\ 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/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index cd3f9701c5..b821e47358 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -61,7 +61,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_arrayParameter: + - subinterface_link_template_Vlan_3_arrayParameter: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -81,7 +81,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -101,7 +101,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index 8a91a43dca..c27d7a8829 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -294,11 +294,11 @@ topology_template: net2: test_net2
net1: test_net1
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_1:
+ - subinterface_link_template_Vlan_1:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
@@ -400,11 +400,11 @@ topology_template: net2: test_net2
net1: test_net1
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_1:
+ - subinterface_link_template_Vlan_1:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
@@ -433,4 +433,4 @@ topology_template: - test_Vlan2
- test_Vlan1
- server_cmaui_nova
- - test_nested
+ - test_nested
\ 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/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 949d55d270..ed9c4c5acd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_3_arrayParameter: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: @@ -98,7 +98,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p2 @@ -139,7 +139,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: p1 @@ -200,24 +200,24 @@ topology_template: - template_Vlan_3_arrayParameter - feature requirements: + subinterface_link_template_Vlan_3_arrayParameter: + - template_Vlan_3_arrayParameter + - subinterface_link + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link dependency_template_Vlan_2: - template_Vlan_2 - dependency dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: - - template_Vlan_1 - - link dependency_template_Vlan_3_arrayParameter: - template_Vlan_3_arrayParameter - dependency - link_template_Vlan_3_arrayParameter: - - template_Vlan_3_arrayParameter - - link - link_template_Vlan_2: - - template_Vlan_2 - - link + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link binding_template_Vlan_2: - template_Vlan_2 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d0270968e9..8b05a3876a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -65,7 +65,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -85,7 +85,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -126,7 +126,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -146,7 +146,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -166,7 +166,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -186,7 +186,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -206,7 +206,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested2Level: + - subinterface_link_template_Vlan_4_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -226,7 +226,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested2Level: + - subinterface_link_template_Vlan_3_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -414,7 +414,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level_test_nested3Level: + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -434,7 +434,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level_test_nested3Level: + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -454,7 +454,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6_test_nested3Level: + - subinterface_link_template_Vlan_6_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -474,7 +474,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5_test_nested3Level: + - subinterface_link_template_Vlan_5_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -494,7 +494,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4: + - subinterface_link_template_Vlan_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -514,7 +514,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -680,7 +680,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level: + - subinterface_link_template_Vlan_8_test_nested4Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -700,7 +700,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level: + - subinterface_link_template_Vlan_7_test_nested4Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -720,7 +720,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6: + - subinterface_link_template_Vlan_6: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -740,7 +740,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5: + - subinterface_link_template_Vlan_5: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -884,7 +884,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8: + - subinterface_link_template_Vlan_8: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -904,7 +904,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7: + - subinterface_link_template_Vlan_7: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index 652a5464a7..e8f7c17fbb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -218,35 +218,35 @@ topology_template: port1: template_VMInt_OAM_lb_1
port2: cmaui_port_2
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_1:
+ - subinterface_link_template_Vlan_1:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_6_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_5_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_4_test_nested2Level:
+ - subinterface_link_template_Vlan_4_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_3_test_nested2Level:
+ - subinterface_link_template_Vlan_3_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
@@ -330,11 +330,11 @@ topology_template: - index_value
port1: cmaui_port_2
requirements:
- - link_template_Vlan_7_test_nested4Level:
+ - subinterface_link_template_Vlan_7_test_nested4Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_6:
+ - subinterface_link_template_Vlan_6:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
@@ -390,4 +390,4 @@ topology_template: - test_resourceGroup
- test_net1
- test_nestedInvalidConnection
- - server_cmaui_nova
+ - server_cmaui_nova
\ 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/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index 92647bb2f8..1dd275150e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -59,7 +59,7 @@ topology_template: type: string node_templates: template_Vlan_2: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port2 @@ -98,7 +98,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_1: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port1 @@ -198,6 +198,12 @@ topology_template: - test_nested2Level - feature_template_Vlan_6_test_nested3Level requirements: + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + subinterface_link_template_Vlan_4_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_4 dependency_template_Vlan_5_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_5_test_nested3Level @@ -207,24 +213,27 @@ topology_template: dependency_template_Vlan_4_test_nested2Level: - test_nested2Level - dependency_template_Vlan_4 + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link dependency_test_nested2Level: - test_nested2Level - dependency - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_7_test_nested4Level_test_nested3Level + - subinterface_link_template_Vlan_6_test_nested3Level dependency_template_Vlan_2: - template_Vlan_2 - dependency binding_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_7_test_nested4Level_test_nested3Level - link_template_Vlan_4_test_nested2Level: - - test_nested2Level - - link_template_Vlan_4 dependency_template_Vlan_1: - template_Vlan_1 - dependency + subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level binding_template_Vlan_2: - template_Vlan_2 - binding @@ -234,9 +243,6 @@ topology_template: dependency_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_8_test_nested4Level_test_nested3Level - link_template_Vlan_6_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_6_test_nested3Level dependency_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_6_test_nested3Level @@ -249,33 +255,27 @@ topology_template: binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_8_test_nested4Level_test_nested3Level + subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level binding_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_6_test_nested3Level dependency_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_7_test_nested4Level_test_nested3Level - link_template_Vlan_1: - - template_Vlan_1 - - link - link_template_Vlan_2: - - template_Vlan_2 - - link + subinterface_link_template_Vlan_3_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_3 dependency_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_test_nested4Level_test_nested3Level - link_template_Vlan_5_test_nested3Level_test_nested2Level: + subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_5_test_nested3Level + - subinterface_link_template_Vlan_5_test_nested3Level dependency_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_test_nested3Level - link_template_Vlan_3_test_nested2Level: - - test_nested2Level - - link_template_Vlan_3 binding_template_Vlan_4_test_nested2Level: - test_nested2Level - - binding_template_Vlan_4 - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_8_test_nested4Level_test_nested3Level
\ No newline at end of file + - binding_template_Vlan_4
\ 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/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index e42ee48133..a18c661c7b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -127,7 +127,7 @@ topology_template: port2: get_input: port1 template_Vlan_4: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port1 @@ -166,7 +166,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_3: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port1 @@ -244,15 +244,18 @@ topology_template: - test_nested3Level - feature_template_Vlan_5 requirements: - link_template_Vlan_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - link_template_Vlan_7_test_nested4Level + subinterface_link_template_Vlan_3: + - template_Vlan_3 + - subinterface_link + subinterface_link_template_Vlan_4: + - template_Vlan_4 + - subinterface_link dependency_template_Vlan_5_test_nested3Level: - test_nested3Level - dependency_template_Vlan_5 - link_template_Vlan_8_test_nested4Level_test_nested3Level: + subinterface_link_template_Vlan_5_test_nested3Level: - test_nested3Level - - link_template_Vlan_8_test_nested4Level + - subinterface_link_template_Vlan_5 binding_template_Vlan_6_test_nested3Level: - test_nested3Level - binding_template_Vlan_6 @@ -262,6 +265,12 @@ topology_template: dependency_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_test_nested4Level + subinterface_link_template_Vlan_6_test_nested3Level: + - test_nested3Level + - subinterface_link_template_Vlan_6 + subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - subinterface_link_template_Vlan_8_test_nested4Level dependency_template_Vlan_7_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_template_Vlan_7_test_nested4Level @@ -271,21 +280,12 @@ topology_template: binding_template_Vlan_8_test_nested4Level_test_nested3Level: - test_nested3Level - binding_template_Vlan_8_test_nested4Level - link_template_Vlan_5_test_nested3Level: - - test_nested3Level - - link_template_Vlan_5 - link_template_Vlan_6_test_nested3Level: + subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level: - test_nested3Level - - link_template_Vlan_6 - link_template_Vlan_3: - - template_Vlan_3 - - link + - subinterface_link_template_Vlan_7_test_nested4Level dependency_template_Vlan_8_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_template_Vlan_8_test_nested4Level - link_template_Vlan_4: - - template_Vlan_4 - - link binding_template_Vlan_4: - template_Vlan_4 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 00a2260614..7b582584e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -120,7 +120,7 @@ topology_template: port2: get_input: port2 template_Vlan_6: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port1 @@ -159,7 +159,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_5: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port2 @@ -226,36 +226,36 @@ topology_template: - test_nested4Level - feature_template_Vlan_7 requirements: - link_template_Vlan_8_test_nested4Level: - - test_nested4Level - - link_template_Vlan_8 + subinterface_link_template_Vlan_5: + - template_Vlan_5 + - subinterface_link binding_template_Vlan_8_test_nested4Level: - test_nested4Level - binding_template_Vlan_8 binding_template_Vlan_7_test_nested4Level: - test_nested4Level - binding_template_Vlan_7 + subinterface_link_template_Vlan_7_test_nested4Level: + - test_nested4Level + - subinterface_link_template_Vlan_7 dependency_template_Vlan_7_test_nested4Level: - test_nested4Level - dependency_template_Vlan_7 dependency_test_nested4Level: - test_nested4Level - dependency - link_template_Vlan_7_test_nested4Level: + subinterface_link_template_Vlan_8_test_nested4Level: - test_nested4Level - - link_template_Vlan_7 - link_template_Vlan_5: - - template_Vlan_5 - - link + - subinterface_link_template_Vlan_8 dependency_template_Vlan_8_test_nested4Level: - test_nested4Level - dependency_template_Vlan_8 - link_template_Vlan_6: - - template_Vlan_6 - - link binding_template_Vlan_6: - template_Vlan_6 - binding + subinterface_link_template_Vlan_6: + - template_Vlan_6 + - subinterface_link binding_template_Vlan_5: - template_Vlan_5 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index bd6e1a1f24..6ec72d7302 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -105,7 +105,7 @@ topology_template: type: string node_templates: template_Vlan_8: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port2 @@ -144,7 +144,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_7: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: port1 @@ -207,15 +207,15 @@ topology_template: dependency_template_Vlan_7: - template_Vlan_7 - dependency - link_template_Vlan_7: + subinterface_link_template_Vlan_7: - template_Vlan_7 - - link - link_template_Vlan_8: - - template_Vlan_8 - - link + - subinterface_link binding_template_Vlan_8: - template_Vlan_8 - binding + subinterface_link_template_Vlan_8: + - template_Vlan_8 + - subinterface_link binding_template_Vlan_7: - template_Vlan_7 - - binding + - binding
\ 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/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cc801ed3d..7087e7d068 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,20 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.FSB1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_FSB1_Internal_mac_address: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_FSB1_Internal_subnetpoolid: type: string required: true @@ -30,74 +22,142 @@ node_types: type: string required: true status: SUPPORTED - port_FSB1_OAM_subnetpoolid: + compute_FSB1_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_FSB2_Internal_2_order: + type: integer + required: true + status: SUPPORTED + vm_flavor_name: type: string required: true status: SUPPORTED - compute_FSB1_metadata: + port_FSB1_OAM_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_FSB2_Internal_1_exCP_naming: - type: org.openecomp.datatypes.Naming + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list required: true status: SUPPORTED - port_FSB1_OAM_exCP_naming: - type: org.openecomp.datatypes.Naming + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: + type: list required: true status: SUPPORTED - port_FSB1_OAM_ip_requirements: + entry_schema: + type: string + port_FSB2_Internal_1_order: + type: integer + required: true + status: SUPPORTED + port_FSB2_Internal_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: - type: integer + port_FSB1_OAM_network: + type: list required: true status: SUPPORTED - port_FSB2_Internal_1_mac_address: + entry_schema: + type: string + port_FSB2_Internal_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_FSB2_Internal_2_network_role: type: string required: true status: SUPPORTED - vm_flavor_name: + port_FSB1_OAM_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_2_mac_address: + port_FSB2_Internal_1_network_role: type: string required: true status: SUPPORTED - port_FSB2_Internal_1_ip_requirements: + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_FSB1_OAM_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB2_Internal_1_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_vlan_requirements: + type: boolean + port_FSB1_OAM_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_OAM_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_1_mac_address: type: string required: true status: SUPPORTED - port_FSB1_OAM_vlan_requirements: + port_FSB2_Internal_2_mac_address: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB2_Internal_2_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network_role_tag: + type: string + required: true + status: SUPPORTED port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -114,13 +174,13 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - compute_FSB1_availability_zone: + port_FSB1_Internal_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - port_FSB1_Internal_network: + type: boolean + compute_FSB1_availability_zone: type: list required: true status: SUPPORTED @@ -134,16 +194,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - status: SUPPORTED - port_FSB2_Internal_2_ip_requirements: + port_FSB2_Internal_2_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: boolean port_FSB1_OAM_order: type: integer required: true @@ -154,28 +210,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_1_network_role_tag: type: string required: true @@ -184,14 +224,6 @@ node_types: type: integer required: true status: SUPPORTED - port_FSB1_OAM_network_role: - type: string - required: true - status: SUPPORTED - port_FSB2_Internal_1_network_role: - type: string - required: true - status: SUPPORTED port_FSB1_OAM_network_role_tag: type: string required: true @@ -212,18 +244,10 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true - status: SUPPORTED requirements: - dependency_FSB1_FSB1_Internal: capability: tosca.capabilities.Node @@ -326,6 +350,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -333,6 +358,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -522,6 +548,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -581,6 +608,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml index 535fa50cf3..29f618cc5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml @@ -11,34 +11,98 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_FSB1_Internal_mac_address: - type: string - required: true port_FSB1_Internal_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_FSB1_Internal_subnetpoolid: type: string required: true port_FSB2_Internal_2_subnetpoolid: type: string required: true - port_FSB1_OAM_subnetpoolid: - type: string - required: true compute_FSB1_metadata: type: list required: true entry_schema: type: json + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_FSB2_Internal_2_order: + type: integer + required: true + vm_flavor_name: + type: string + required: true + port_FSB1_OAM_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_Internal_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_1_order: + type: integer + required: true + port_FSB2_Internal_2_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_FSB1_OAM_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_1_network: + type: list + required: true + entry_schema: + type: string + port_FSB2_Internal_2_network_role: + type: string + required: true + port_FSB1_OAM_network_role: + type: string + required: true + port_FSB2_Internal_1_network_role: + type: string + required: true + port_FSB2_Internal_2_network_role_tag: + type: string + required: true + port_FSB2_Internal_1_subnetpoolid: + type: string + required: true + port_FSB1_Internal_mac_address: + type: string + required: true + port_FSB2_Internal_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_FSB1_OAM_subnetpoolid: + type: string + required: true port_FSB2_Internal_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_FSB2_Internal_1_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -47,15 +111,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_FSB2_Internal_2_order: - type: integer - required: true port_FSB2_Internal_1_mac_address: type: string required: true - vm_flavor_name: - type: string - required: true port_FSB2_Internal_2_mac_address: type: string required: true @@ -72,16 +130,6 @@ topology_template: port_FSB1_Internal_network_role_tag: type: string required: true - port_FSB1_OAM_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB1_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -94,12 +142,12 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_FSB1_availability_zone: + port_FSB1_Internal_subinterface_indicator: type: list required: true entry_schema: - type: string - port_FSB1_Internal_network: + type: boolean + compute_FSB1_availability_zone: type: list required: true entry_schema: @@ -111,14 +159,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_FSB2_Internal_1_order: - type: integer - required: true - port_FSB2_Internal_2_ip_requirements: + port_FSB2_Internal_2_subinterface_indicator: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: boolean port_FSB1_OAM_order: type: integer required: true @@ -127,36 +172,17 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - port_FSB1_OAM_network: - type: list - required: true - entry_schema: - type: string - port_FSB2_Internal_1_network: - type: list - required: true - entry_schema: - type: string port_FSB2_Internal_2_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_2_network_role: - type: string - required: true port_FSB2_Internal_1_network_role_tag: type: string required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_OAM_network_role: - type: string - required: true - port_FSB2_Internal_1_network_role: - type: string - required: true port_FSB1_OAM_network_role_tag: type: string required: true @@ -173,15 +199,9 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_FSB2_Internal_2_network_role_tag: - type: string - required: true port_FSB2_Internal_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB2_Internal_1_subnetpoolid: - type: string - required: true node_templates: FSB1_FSB1_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -190,6 +210,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -220,6 +244,10 @@ topology_template: get_input: port_FSB2_Internal_1_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_1_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_1_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_1_ip_requirements network_role_tag: @@ -250,6 +278,10 @@ topology_template: get_input: port_FSB2_Internal_2_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_2_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_2_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_2_ip_requirements network_role_tag: @@ -280,6 +312,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8c748e2a2e..e21fa17343 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -42,6 +42,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -98,6 +104,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -249,6 +267,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -423,6 +442,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -470,6 +490,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml index e5ebd6aa8b..e1a6f40602 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -82,6 +87,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -154,6 +169,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -184,6 +203,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -214,6 +237,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 504c059abd..8113a8048f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -74,6 +74,12 @@ node_types: type: string required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -116,6 +122,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -203,6 +215,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -355,6 +368,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index 3509df1630..72d2ee6f1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -63,6 +63,11 @@ topology_template: port_FSB1_Internal_network_role: type: string required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -97,6 +102,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -116,6 +126,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -146,6 +160,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index d197cd7c54..52effbbc3a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -42,6 +42,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -98,6 +104,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -154,6 +166,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -273,6 +291,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -447,6 +466,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -494,6 +514,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index c72dee50d8..0fb34fd252 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -38,6 +38,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -82,6 +87,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -127,6 +137,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -154,6 +169,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -184,6 +203,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -214,6 +237,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6e788ce110..c88962628d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -38,6 +38,48 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB2_Internal_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_FSB2_Internal_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_network_role_tag: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_FSB1_Internal_network_role: + type: string + required: true + status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -56,52 +98,30 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_FSB2_Internal_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_mac_address: type: string required: true status: SUPPORTED - port_FSB2_Internal_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_FSB1_Internal_network_role_tag: - type: string - required: true - status: SUPPORTED port_FSB1_Internal_order: type: integer required: true status: SUPPORTED - port_FSB1_Internal_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB2_Internal_subinterface_indicator: + type: list required: true status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -112,14 +132,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_FSB1_Internal_network_role: - type: string - required: true - status: SUPPORTED port_FSB2_Internal_network_role_tag: type: string required: true @@ -197,6 +209,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -349,6 +362,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml index 69b999862e..b1ba634c79 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml @@ -35,6 +35,39 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB2_Internal_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + vm_flavor_name: + type: string + required: true + port_FSB2_Internal_network_role: + type: string + required: true + port_FSB1_Internal_network_role_tag: + type: string + required: true + port_FSB1_Internal_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_FSB2_Internal_subnetpoolid: + type: string + required: true + port_FSB1_Internal_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_FSB1_Internal_network_role: + type: string + required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_FSB1_availability_zone: type: list required: true @@ -50,42 +83,25 @@ topology_template: port_FSB2_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_FSB2_Internal_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_flavor_name: - type: string - required: true port_FSB2_Internal_mac_address: type: string required: true - port_FSB2_Internal_network_role: - type: string - required: true port_FSB2_Internal_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_FSB1_Internal_network_role_tag: - type: string - required: true port_FSB1_Internal_order: type: integer required: true - port_FSB1_Internal_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_FSB2_Internal_network: type: list required: true entry_schema: type: string - port_FSB2_Internal_subnetpoolid: - type: string + port_FSB2_Internal_subinterface_indicator: + type: list required: true + entry_schema: + type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -94,12 +110,6 @@ topology_template: required: true entry_schema: type: string - port_FSB1_Internal_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_FSB1_Internal_network_role: - type: string - required: true port_FSB2_Internal_network_role_tag: type: string required: true @@ -111,6 +121,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -137,18 +151,24 @@ topology_template: FSB1_FSB2_Internal: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_FSB2_Internal_mac_requirements + order: + get_input: port_FSB2_Internal_order + mac_address: + get_input: port_FSB2_Internal_mac_address exCP_naming: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: get_input: port_FSB2_Internal_network_role_tag - mac_requirements: - get_input: port_FSB2_Internal_mac_requirements - order: - get_input: port_FSB2_Internal_order network_role: get_input: port_FSB2_Internal_network_role subnetpoolid: @@ -161,8 +181,6 @@ topology_template: get_input: - port_FSB2_Internal_network - index_value - mac_address: - get_input: port_FSB2_Internal_mac_address requirements: - binding: capability: tosca.capabilities.network.Bindable diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8b3a09474c..7fd691c1d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -36,6 +36,12 @@ node_types: type: integer required: true status: SUPPORTED + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -92,6 +98,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_Internal_network: type: list required: true @@ -142,6 +154,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -255,6 +273,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -429,6 +448,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -476,6 +496,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml index 12cc87e626..f0a87d321a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -33,6 +33,11 @@ topology_template: port_FSB2_Internal_order: type: integer required: true + port_FSB1_OAM_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -77,6 +82,11 @@ topology_template: port_FSB1_OAM_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_FSB1_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_Internal_network: type: list required: true @@ -117,6 +127,11 @@ topology_template: required: true entry_schema: type: string + port_FSB2_Internal_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_FSB1_OAM_network_role_tag: type: string required: true @@ -139,6 +154,10 @@ topology_template: get_input: port_FSB1_Internal_exCP_naming vlan_requirements: get_input: port_FSB1_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_Internal_ip_requirements network_role_tag: @@ -169,6 +188,10 @@ topology_template: get_input: port_FSB2_Internal_exCP_naming vlan_requirements: get_input: port_FSB2_Internal_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB2_Internal_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB2_Internal_ip_requirements network_role_tag: @@ -199,6 +222,10 @@ topology_template: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: get_input: port_FSB1_OAM_vlan_requirements + subinterface_indicator: + get_input: + - port_FSB1_OAM_subinterface_indicator + - index_value ip_requirements: get_input: port_FSB1_OAM_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml index 62e3c5574a..bc08b781f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml @@ -74,6 +74,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -85,6 +86,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -101,6 +103,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -181,12 +184,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -199,6 +206,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml index 6305a7cae6..5c86ef6c5b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml @@ -69,6 +69,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -80,6 +81,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -158,6 +160,8 @@ topology_template: directives: - substitutable properties: + port_FSB1_Internal_2_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: @@ -166,6 +170,8 @@ topology_template: - STATIC-DATA-FSB1 port_FSB1_Internal_1_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_Internal_1_subinterface_indicator: + - true port_FSB1_Internal_1_network: - Internal1-net port_FSB1_Internal_2_mac_address: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml index ca75560607..9b54fbea73 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml @@ -94,6 +94,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -105,6 +106,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -116,6 +118,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -131,6 +134,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -252,6 +256,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -267,6 +274,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml index 51410677fb..cf83056eb9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml @@ -259,12 +259,16 @@ topology_template: directives: - substitutable properties: + port_VMI_subinterface_indicator: + - true port_FSB1_Port_network: - Internal1-net vm_flavor_name: get_input: fsb1-flavor port_FSB1_Port_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_Port_subinterface_indicator: + - true compute_FSB1_availability_zone: - get_input: fsb_zone port_VMI_port_tuple_refs: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml deleted file mode 100644 index 4113dadea4..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in/MainServiceTemplate.yaml +++ /dev/null @@ -1,240 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -node_types: - org.openecomp.resource.vfc.nodes.heat.FSB1: - derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server -topology_template: - inputs: - fsb1-name: - label: FSB1_name - hidden: false - immutable: false - type: string - description: FSB1_name - fsb1-Internal1-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - cps_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-flavor: - label: FSB1_flavor - hidden: false - immutable: false - type: string - description: FSB1_flavor - fsb1-Internal2-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - volume_type: - label: volume type - hidden: false - immutable: false - type: string - description: volume type Gold - fsb_zone: - label: FSB1_zone - hidden: false - immutable: false - type: string - description: FSB1_zone - oam_net_gw: - hidden: false - immutable: false - type: string - description: prop - network_name: - hidden: false - immutable: false - type: string - description: prop - cps_net_ip: - hidden: false - immutable: false - type: string - description: prop - jsa_net_name: - label: jsa_net_name - hidden: false - immutable: false - type: string - description: jsa_net_name - default: jsa_log_net_0 - pcrf_psm_server_name: - label: pcrf_psm_server_name - hidden: false - immutable: false - type: string - description: pcrf_psm_server_name - pcm_flavor_name: - label: pcm_flavor_name - hidden: false - immutable: false - type: string - description: pcm_flavor_name - oam_net_id: - label: oam_net_id - hidden: false - immutable: false - type: string - description: oam_net_id - oam_net_ip: - hidden: false - immutable: false - type: string - description: prop - oam_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-oam-ip: - hidden: false - immutable: false - type: string - description: prop - node_templates: - FSB2_Internal2: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_address: - get_input: fsb1-Internal2-mac - network: Internal2-net - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1_template - relationship: tosca.relationships.network.BindsTo - FSB1_Internal1: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - mac_address: - get_input: fsb1-Internal1-mac - network: Internal1-net - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: FSB1_template - relationship: tosca.relationships.network.BindsTo - - link: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - jsa_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_attribute: - - FSB1_Internal1 - - network_id - dhcp_agent_ids: - get_attribute: - - FSB1_template - - addresses - tenant_id: - get_attribute: - - FSB2_Internal2 - - network_id - qos_policy: - get_attribute: - - FSB2_Internal2 - - network_id - FSB1_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - FSB2_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - FSB3_template: - type: org.openecomp.resource.vfc.nodes.heat.FSB1 - properties: - flavor: - get_input: fsb1-flavor - availability_zone: - get_input: fsb_zone - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - cmaui_volume1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - cmaui_volume2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - groups: - ep-jsa_net_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/ep-jsa_net.yaml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - FSB2_Internal2 - - FSB1_Internal1 - - FSB1_template - - FSB2_template - - FSB3_template - outputs: - simpleOutput1: - value: {get_attribute: [ FSB1_template, accessIPv4 ] } - simpleOutput2: - value: {get_attribute: [ FSB2_template, addresses, key1 ] } - complexOutput1: - value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]} - complexOutput2: - description: cgi fw01 left interface Mac-Address - value: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } - complexOutput3: - description: cgi fw01 left interface Mac-Address - value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,admin_state_up ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml deleted file mode 100644 index 35a1e38837..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/out/MainServiceTemplate.yaml +++ /dev/null @@ -1,294 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: Main -imports: -- openecomp_heat_index: - file: openecomp-heat/_index.yml -- GlobalSubstitutionTypes: - file: GlobalSubstitutionTypesServiceTemplate.yaml -topology_template: - inputs: - fsb1-name: - label: FSB1_name - hidden: false - immutable: false - type: string - description: FSB1_name - fsb1-Internal1-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - cps_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-flavor: - label: FSB1_flavor - hidden: false - immutable: false - type: string - description: FSB1_flavor - fsb1-Internal2-mac: - label: FSB1_internal_mac - hidden: false - immutable: false - type: string - description: FSB1_internal_mac - volume_type: - label: volume type - hidden: false - immutable: false - type: string - description: volume type Gold - fsb_zone: - label: FSB1_zone - hidden: false - immutable: false - type: string - description: FSB1_zone - oam_net_gw: - hidden: false - immutable: false - type: string - description: prop - network_name: - hidden: false - immutable: false - type: string - description: prop - cps_net_ip: - hidden: false - immutable: false - type: string - description: prop - jsa_net_name: - label: jsa_net_name - hidden: false - immutable: false - type: string - description: jsa_net_name - default: jsa_log_net_0 - pcrf_psm_server_name: - label: pcrf_psm_server_name - hidden: false - immutable: false - type: string - description: pcrf_psm_server_name - pcm_flavor_name: - label: pcm_flavor_name - hidden: false - immutable: false - type: string - description: pcm_flavor_name - oam_net_id: - label: oam_net_id - hidden: false - immutable: false - type: string - description: oam_net_id - oam_net_ip: - hidden: false - immutable: false - type: string - description: prop - oam_net_mask: - hidden: false - immutable: false - type: string - description: prop - fsb1-oam-ip: - hidden: false - immutable: false - type: string - description: prop - node_templates: - jsa_net1: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - shared: true - network_name: - get_attribute: - - FSB1_Internal1 - - network_id - dhcp_agent_ids: - get_attribute: - - FSB1_template - - addresses - tenant_id: - get_attribute: - - FSB2_Internal2 - - network_id - qos_policy: - get_attribute: - - FSB2_Internal2 - - network_id - cmaui_volume1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - cmaui_volume2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: CMAUI_volume_type - size: '(get_input : cmaui_cinder_volume_size) * 1024' - abstract_FSB1_0: - type: org.openecomp.resource.abstract.nodes.FSB1_0 - directives: - - substitutable - properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - compute_FSB1_availability_zone: - - get_input: fsb_zone - port_FSB1_Internal_network: - - Internal1-net - vm_flavor_name: - get_input: fsb1-flavor - port_FSB2_Internal_mac_address: - get_input: fsb1-Internal2-mac - port_FSB2_Internal_network: - - Internal2-net - service_template_filter: - substitute_service_template: Nested_FSB1_0ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - abstract_FSB1_1: - type: org.openecomp.resource.abstract.nodes.FSB1_1 - directives: - - substitutable - properties: - compute_FSB1_availability_zone: - - get_input: fsb_zone - vm_flavor_name: - get_input: fsb1-flavor - service_template_filter: - substitute_service_template: Nested_FSB1_1ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - abstract_FSB1_2: - type: org.openecomp.resource.abstract.nodes.FSB1_2 - directives: - - substitutable - properties: - compute_FSB1_availability_zone: - - get_input: fsb_zone - vm_flavor_name: - get_input: fsb1-flavor - service_template_filter: - substitute_service_template: Nested_FSB1_2ServiceTemplate.yaml - count: 1 - index_value: - get_property: - - SELF - - service_template_filter - - index_value - requirements: - - link_FSB1_FSB1_Internal: - capability: tosca.capabilities.network.Linkable - node: jsa_net1 - relationship: tosca.relationships.network.LinksTo - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume1 - relationship: cmaui_volume_attachment - - local_storage_FSB1: - capability: tosca.capabilities.Attachment - node: cmaui_volume2 - relationship: cmaui_volume_attachment - groups: - ep-jsa_net_group: - type: org.openecomp.groups.heat.HeatStack - properties: - heat_file: ../Artifacts/ep-jsa_net.yaml - description: | - Version 2.0 02-09-2016 (Authors: John Doe, user PROD) - members: - - abstract_FSB1_0 - - abstract_FSB1_1 - - abstract_FSB1_2 - outputs: - simpleOutput1: - value: - get_attribute: - - abstract_FSB1_0 - - FSB1_accessIPv4 - simpleOutput2: - value: - get_attribute: - - FSB2_template - - addresses - - key1 - complexOutput1: - value: - get_attribute: - - abstract_FSB1_0 - - FSB1_addresses - - get_attribute: - - abstract_FSB1_0 - - FSB1_FSB2_Internal_tenant_id - complexOutput2: - description: cgi fw01 left interface Mac-Address - value: - get_attribute: - - FSB1_Internal2 - - device_owner - - get_input: - - CMAUI_volume_type - - get_attribute: - - FSB2_Internal1 - - user_data_format - - 0 - - OS-EXT-IPS-MAC:mac_addr - complexOutput3: - description: cgi fw01 left interface Mac-Address - value: - get_input: - - a - - addresses - - get_input: - - CMAUI_volume_type - - get_attribute: - - abstract_FSB1_0 - - FSB1_FSB1_Internal_admin_state_up - - 0 - - OS-EXT-IPS-MAC:mac_addr diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml index d4722c1b28..a46b7613ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -249,6 +253,9 @@ topology_template: compute_FSB_admin_pass: - OPTIONAL-DATA-FSB1 - null + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -264,6 +271,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml index 12db507859..9efe855849 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml @@ -57,6 +57,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -88,6 +89,7 @@ topology_template: replacement_policy: AUTO network: get_input: port_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,8 @@ topology_template: - RAW vm_image_name: get_input: image_smp_name + port_port_1_subinterface_indicator: + - true port_port_2_replacement_policy: - AUTO compute_smp_name: @@ -114,6 +118,8 @@ topology_template: - AUTO port_port_1_network: - get_input: port_name + port_port_2_subinterface_indicator: + - true port_port_2_network: - get_input: port_name compute_smp_metadata: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml index df2509108f..7691174c4c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -262,6 +266,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -277,6 +284,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml index 44452b959f..386d6cd7fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml @@ -55,6 +55,7 @@ topology_template: properties: network: get_input: cdr_network + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -65,6 +66,7 @@ topology_template: properties: network: get_input: oam_private_net_name + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -97,18 +99,22 @@ topology_template: directives: - substitutable properties: + vm_flavor_name: FLAVOR-test + vm_image_name: Image-test + port_oam_private_net_network_port_subinterface_indicator: + - true compute_QRouter_availability_zone: - Availability-test compute_QRouter_config_drive: - true port_cdr_network_port_network: - get_input: cdr_network - vm_flavor_name: FLAVOR-test port_oam_private_net_network_port_network: - get_input: oam_private_net_name - vm_image_name: Image-test compute_QRouter_name: - QRouter-name + port_cdr_network_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_QRouterServiceTemplate.yaml count: 1 @@ -127,4 +133,4 @@ topology_template: - packet_mirror_network - packet_internal_network - cdr_network_port - - oam_private_net_network_port
\ No newline at end of file + - oam_private_net_network_port diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml index 5071ce06a4..f2d7a0b7f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -249,6 +253,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -264,6 +271,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml index a881a1e458..c4d02a16cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml @@ -79,6 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -90,6 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -175,12 +178,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -193,6 +200,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml index 6ae9f35a2a..82e7614811 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml @@ -104,6 +104,7 @@ topology_template: mac_address: get_input: fsb2-Internal2-mac network: Internal2-net-fsb2-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -119,6 +120,7 @@ topology_template: mac_address: get_input: fsb2-Internal1-mac network: Internal2-net-fsb2-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -134,6 +136,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal1-net-fsb1-Internal2 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -149,6 +152,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net-fsb1-Internal1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -289,6 +293,9 @@ topology_template: compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 + port_FSB1_Internal_subinterface_indicator: + - true + - true port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 @@ -304,6 +311,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true + - true compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index 99365a8f15..8e411bde02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -79,6 +79,7 @@ topology_template: mac_address: get_input: fsb1-Internal2-mac network: Internal2-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -90,6 +91,7 @@ topology_template: mac_address: get_input: fsb1-Internal1-mac network: Internal1-net + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -106,6 +108,7 @@ topology_template: - ip_address: get_input: fsb1-oam-ip network: jsa_net1 + subinterface_indicator: true requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -195,12 +198,16 @@ topology_template: properties: port_FSB1_Internal_mac_address: get_input: fsb1-Internal1-mac + port_FSB1_OAM_subinterface_indicator: + - true vm_flavor_name: get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB1_Internal_subinterface_indicator: + - true port_FSB1_Internal_network: - Internal1-net port_FSB2_Internal_mac_address: @@ -213,6 +220,8 @@ topology_template: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 + port_FSB2_Internal_subinterface_indicator: + - true compute_FSB_availability_zone: - get_input: fsb1_zone port_FSB1_OAM_fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml index ba88f63df6..66cca69468 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -357,6 +357,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -459,4 +460,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java index d48fe6f44b..9afe8e5521 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/ToscaNodeType.java @@ -72,9 +72,8 @@ public class ToscaNodeType { CP_NODE_TYPE_PREFIX + "heat.contrailV2.VirtualMachineInterface"; public static final String CONTRAIL_PORT = CP_NODE_TYPE_PREFIX + "heat.network.contrail.Port"; public static final String NETWORK_PORT = CP_NODE_TYPE_PREFIX + "network.Port"; - public static final String NETWORK_SUB_INTERFACE = CP_NODE_TYPE_PREFIX + "network.SubInterface"; public static final String CONTRAILV2_VLAN_SUB_INTERFACE = CP_NODE_TYPE_PREFIX - + "heat.network.contrailV2.VLANSubInterface"; + + "heat.network.v2.contrailV2.VLANSubInterface"; public static final String NESTED_HEAT_RESOURCE_TYPE_PREFIX = ABSTRACT_NODE_TYPE_PREFIX + "heat."; public static final String VLAN_SUB_INTERFACE_RESOURCE_TYPE_PREFIX = NESTED_HEAT_RESOURCE_TYPE_PREFIX + "subinterface."; |