aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreleonorali <eleonoral@amdocs.com>2018-02-11 12:15:48 +0200
committereleonorali <eleonoral@amdocs.com>2018-02-11 12:16:01 +0200
commitd5b4901c6a1ae136138c1300d377447e26bac4ef (patch)
treee25360262affbacfdf1bcaeb1e8976e6d8ebae58
parenteae2ba3f5ccfb20a899262562bd91129b6d53423 (diff)
SRIOV - add annotations
SRIOV - add annotations to input TOSCA parameter converted from HEAT file (2) Change-Id: Id0b0156730ae64093df42d09e2873de047c13ac9 Issue-ID: SDC-996 Signed-off-by: eleonorali <eleonoral@amdocs.com>
-rw-r--r--common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java25
-rw-r--r--common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java42
-rw-r--r--common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java53
-rw-r--r--common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java34
-rw-r--r--common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml2
-rw-r--r--common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml42
-rw-r--r--openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java21
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java582
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java79
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/impl/heattotosca/parameters/HeatParameterConversionTest.java51
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml119
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml821
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml119
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml146
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml131
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml146
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml119
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml120
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml1112
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json38
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env51
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml216
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env52
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml218
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env52
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml219
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml157
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml334
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml394
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml386
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json37
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml65
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml64
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml94
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml246
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml381
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml71
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml116
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml301
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/MANIFEST.json (renamed from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/MANIFEST.json)0
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.env (renamed from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.env)0
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.yaml (renamed from openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.yaml)0
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml138
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml826
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml386
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml34
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml1113
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml986
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_MultiPolicy_single_net_translation/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_Multi_net_single_policy_translation/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/invalid_policy_resource_type/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/simple/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedArrayParam/expectedoutputfiles/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml114
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml59
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml122
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml242
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml202
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml234
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml274
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles/MainServiceTemplate.yaml122
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/MainServiceTemplate.yaml138
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml425
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml64
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml152
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml64
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml274
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml146
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml274
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml274
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml490
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml162
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/MainServiceTemplate.yaml138
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml64
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml64
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml186
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml40
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml964
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml1212
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml162
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml146
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml146
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml120
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml120
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml120
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml144
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml40
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml40
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml32
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml72
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml80
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml144
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml40
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml408
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml184
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml152
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml152
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml152
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml328
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml328
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml402
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml402
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml386
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml234
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParam/expectedoutputfiles/MainServiceTemplate.yaml314
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml338
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrNestedAtt/expectedoutputfiles/MainServiceTemplate.yaml314
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/MainServiceTemplate.yaml282
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/MainServiceTemplate.yaml282
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml450
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/MainServiceTemplate.yaml490
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml42
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml610
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml614
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml594
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml148
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml178
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml34
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml148
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml62
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml170
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml194
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml59
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml640
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml714
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml51
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml122
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml810
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/MainServiceTemplate.yaml122
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml130
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml132
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml132
-rw-r--r--openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java34
-rw-r--r--openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ConfigConstants.java15
-rw-r--r--openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaConstants.java25
-rw-r--r--openecomp-be/lib/openecomp-tosca-lib/src/main/resources/config.properties1
230 files changed, 38532 insertions, 699 deletions
diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java
index aecb9315e3..297a2498bb 100644
--- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java
+++ b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/ServiceTemplate.java
@@ -1,25 +1,22 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.tosca.datatypes.model;
+import org.openecomp.sdc.tosca.datatypes.model.heatextend.AnnotationType;
import java.util.List;
import java.util.Map;
@@ -39,6 +36,7 @@ public class ServiceTemplate implements Template {
private Map<String, NodeType> node_types;
private Map<String, GroupType> group_types;
private Map<String, PolicyType> policy_types;
+ private Map<String, AnnotationType> annotation_types;
private TopologyTemplate topology_template;
public String getTosca_definitions_version() {
@@ -145,4 +143,13 @@ public class ServiceTemplate implements Template {
public void setTopology_template(TopologyTemplate topology_template) {
this.topology_template = topology_template;
}
+
+ public Map<String, AnnotationType> getAnnotation_types() {
+ return annotation_types;
+ }
+
+ public void setAnnotation_types(Map<String, AnnotationType> annotation_types) {
+ this.annotation_types = annotation_types;
+ }
+
}
diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java
new file mode 100644
index 0000000000..24b5dec416
--- /dev/null
+++ b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationDefinition.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.tosca.datatypes.model.heatextend;
+
+import java.util.Map;
+
+public class AnnotationDefinition {
+
+ private String type;
+ private Map<String, Object> properties;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public Map<String, Object> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, Object> properties) {
+ this.properties = properties;
+ }
+
+}
diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java
new file mode 100644
index 0000000000..b76966e1f8
--- /dev/null
+++ b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/AnnotationType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ package org.openecomp.sdc.tosca.datatypes.model.heatextend;
+
+ import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
+
+ import java.util.Map;
+
+ public class AnnotationType {
+
+ private String version;
+ private String description;
+ private Map<String, PropertyDefinition> properties;
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Map<String, PropertyDefinition> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(Map<String, PropertyDefinition> properties) {
+ this.properties = properties;
+ }
+
+ } \ No newline at end of file
diff --git a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
index 5442db244f..58ee1cadd0 100644
--- a/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
+++ b/common/openecomp-tosca-datatype/src/main/java/org/openecomp/sdc/tosca/datatypes/model/heatextend/ParameterDefinitionExt.java
@@ -1,35 +1,30 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.tosca.datatypes.model.heatextend;
-
import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition;
-
-
+import java.util.Map;
public class ParameterDefinitionExt extends ParameterDefinition {
- String label;
- Boolean hidden;
- Boolean immutable;
+ private String label;
+ private Boolean hidden;
+ private Boolean immutable;
+ private Map<String, AnnotationDefinition> annotations;
public String getLabel() {
return label;
@@ -54,4 +49,13 @@ public class ParameterDefinitionExt extends ParameterDefinition {
public void setImmutable(Boolean immutable) {
this.immutable = immutable;
}
+
+ public Map<String, AnnotationDefinition> getAnnotations() {
+ return annotations;
+ }
+
+ public void setAnnotations(Map<String, AnnotationDefinition> annotations) {
+ this.annotations = annotations;
+ }
+
}
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
index 5c4cefb6ff..8f6d419536 100644
--- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/_index.yml
@@ -32,4 +32,6 @@ imports:
file: groups.yml
- data:
file: data.yml
+- annotations:
+ file: annotations.yml
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml
new file mode 100644
index 0000000000..bfbf1c2d32
--- /dev/null
+++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/annotations.yml
@@ -0,0 +1,42 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+tosca_definitions_version: tosca_simple_yaml_1_1
+
+metadata:
+ filename: openecomp/annotations.yml
+ version: '1.0'
+
+imports:
+- openecomp_index:
+ file: _index.yml
+
+annotation_types:
+
+ org.openecomp.annotations.Source:
+ description: Indicates the origin source of an input
+ properties:
+ source_type:
+ type: string
+ required: true
+ vf_module_label:
+ description: List of HEAT file name this input was originated from
+ type: list
+ required: true
+ entry_schema:
+ type: string
+ param_name:
+ type: string
+ required: false
+ description: Source parameter name \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
index 2fa71a52d1..09e7bd4396 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
@@ -1,19 +1,3 @@
-/*
- * Copyright © 2016-2017 European Support Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package org.openecomp.sdc.common.togglz;
import org.togglz.core.Feature;
@@ -26,7 +10,10 @@ public enum ToggleableFeature implements Feature {
FORWARDER_CAPABILITY,
@Label ("VLAN Tagging")
- VLAN_TAGGING;
+ VLAN_TAGGING,
+
+ @Label ("Annotations")
+ ANNOTATIONS;
public boolean isActive() {
return FeatureContext.getFeatureManager().isActive(this);
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
index 88e96037f5..dafd8e6207 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
@@ -645,7 +645,11 @@ public class HeatToToscaUtil {
* @return the boolean
*/
public static boolean isHeatFileNested(TranslateTo translateTo, String heatFileName) {
- return translateTo.getContext().getNestedHeatsFiles().contains(heatFileName);
+ return isHeatFileNested(translateTo.getContext(), heatFileName);
+ }
+
+ public static boolean isHeatFileNested(TranslationContext context, String heatFileName) {
+ return context.getNestedHeatsFiles().contains(heatFileName);
}
/**
@@ -1190,6 +1194,10 @@ public class HeatToToscaUtil {
return !capabilityKey.contains(FORWARDER) || ToggleableFeature.FORWARDER_CAPABILITY.isActive();
}
+ public static boolean shouldAnnotationsToBeAdded() {
+ return ToggleableFeature.ANNOTATIONS.isActive();
+ }
+
private static void addCapabilityToSubMapping(String templateName,
Map.Entry<String, CapabilityDefinition> capabilityNodeEntry,
Map<String, CapabilityDefinition> nodeTypeCapabilitiesDefinition,
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
index d403fcbedc..c84ed22011 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
@@ -1,21 +1,17 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2018 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.translator.services.heattotosca;
@@ -39,6 +35,7 @@ import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition;
import org.openecomp.sdc.tosca.datatypes.model.PropertyType;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.datatypes.model.TopologyTemplate;
+import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt;
import org.openecomp.sdc.tosca.services.DataModelUtil;
import org.openecomp.sdc.tosca.services.ToscaConstants;
import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
@@ -60,308 +57,343 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
public class TranslationService {
- protected static Logger logger = LoggerFactory.getLogger(TranslationService.class);
- /**
- * Gets types to process by translator.
- *
- * @return the types to process by translator
- */
- public static Set<FileData.Type> getTypesToProcessByTranslator() {
- Set<FileData.Type> types = new HashSet<>();
- types.add(FileData.Type.HEAT);
- types.add(FileData.Type.HEAT_VOL);
- return types;
- }
-
- /**
- * Translate heat files translator output.
- *
- * @param translationContext the translation context
- * @return the translator output
- */
- public TranslatorOutput translateHeatFiles(TranslationContext translationContext) {
- ServiceTemplate mainServiceTemplate = createMainServiceTemplate(translationContext);
- List<FileData> fileDataList = translationContext.getManifest().getContent().getData();
- FileDataCollection fileDataCollection = HeatToToscaUtil.getFileCollectionsByFilter(fileDataList,
- TranslationService.getTypesToProcessByTranslator(), translationContext);
-
- if (fileDataCollection.getBaseFile() != null) {
- for (FileData fileData : fileDataCollection.getBaseFile()) {
- translateHeatFile(mainServiceTemplate, fileData, translationContext);
- }
+ protected static Logger logger = LoggerFactory.getLogger(TranslationService.class);
+
+ /**
+ * Gets types to process by translator.
+ *
+ * @return the types to process by translator
+ */
+ public static Set<FileData.Type> getTypesToProcessByTranslator() {
+ Set<FileData.Type> types = new HashSet<>();
+ types.add(FileData.Type.HEAT);
+ types.add(FileData.Type.HEAT_VOL);
+ return types;
}
- if (fileDataCollection.getAddOnFiles() != null) {
- for (FileData fileData : fileDataCollection.getAddOnFiles()) {
- translateHeatFile(mainServiceTemplate, fileData, translationContext);
- }
+
+ /**
+ * Translate heat files translator output.
+ *
+ * @param translationContext the translation context
+ * @return the translator output
+ */
+ public TranslatorOutput translateHeatFiles(TranslationContext translationContext) {
+ ServiceTemplate mainServiceTemplate = createMainServiceTemplate(translationContext);
+ List<FileData> fileDataList = translationContext.getManifest().getContent().getData();
+ FileDataCollection fileDataCollection = HeatToToscaUtil.getFileCollectionsByFilter(fileDataList,
+ TranslationService.getTypesToProcessByTranslator(), translationContext);
+
+ if (fileDataCollection.getBaseFile() != null) {
+ for (FileData fileData : fileDataCollection.getBaseFile()) {
+ translateHeatFile(mainServiceTemplate, fileData, translationContext);
+ }
+ }
+ if (fileDataCollection.getAddOnFiles() != null) {
+ for (FileData fileData : fileDataCollection.getAddOnFiles()) {
+ translateHeatFile(mainServiceTemplate, fileData, translationContext);
+ }
+ }
+
+ ToscaServiceModel toscaServiceModel =
+ HeatToToscaUtil.createToscaServiceModel(mainServiceTemplate, translationContext);
+
+ TranslatorOutput translatorOutput = new TranslatorOutput();
+ //Keeping a copy of tosca service model after first stage of translation for extraction of
+ // composition data
+ translatorOutput.setNonUnifiedToscaServiceModel(
+ ToscaServiceModel.getClonedServiceModel(toscaServiceModel));
+ translatorOutput.setToscaServiceModel(toscaServiceModel);
+ return translatorOutput;
}
- ToscaServiceModel toscaServiceModel =
- HeatToToscaUtil.createToscaServiceModel(mainServiceTemplate, translationContext);
-
- TranslatorOutput translatorOutput = new TranslatorOutput();
- //Keeping a copy of tosca service model after first stage of translation for extraction of
- // composition data
- translatorOutput.setNonUnifiedToscaServiceModel(
- ToscaServiceModel.getClonedServiceModel(toscaServiceModel));
- translatorOutput.setToscaServiceModel(toscaServiceModel);
- return translatorOutput;
- }
-
- private ServiceTemplate createMainServiceTemplate(TranslationContext translationContext) {
- ServiceTemplate mainServiceTemplate = new ServiceTemplate();
- translationContext.getTranslatedServiceTemplates()
- .put(Constants.MAIN_TEMPLATE_NAME, mainServiceTemplate);
- Map<String, String> templateMetadata = new HashMap<>();
- templateMetadata.put(ToscaConstants.ST_METADATA_TEMPLATE_NAME, Constants.MAIN_TEMPLATE_NAME);
- mainServiceTemplate.setTosca_definitions_version(ToscaConstants.TOSCA_DEFINITIONS_VERSION);
- mainServiceTemplate.setMetadata(templateMetadata);
- mainServiceTemplate.setTopology_template(new TopologyTemplate());
- mainServiceTemplate.setImports(GlobalTypesGenerator.getGlobalTypesImportList());
- return mainServiceTemplate;
- }
-
- /**
- * Translate heat file.
- *
- * @param serviceTemplate the service template
- * @param heatFileData the heat file data
- * @param context the context
- */
- public void translateHeatFile(ServiceTemplate serviceTemplate, FileData heatFileData,
- TranslationContext context) {
- String heatFileName = heatFileData.getFile();
- HeatOrchestrationTemplate heatOrchestrationTemplate = new YamlUtil()
- .yamlToObject(context.getFileContent(heatFileName), HeatOrchestrationTemplate.class);
-
- translateInputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData, context,
- heatFileName);
- translateResources(heatFileName, serviceTemplate, heatOrchestrationTemplate, context);
- translateOutputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData,
- heatFileName, context);
- createHeatStackGroup(serviceTemplate, heatFileData, heatOrchestrationTemplate, context);
- handleHeatPseudoParam(heatFileName, serviceTemplate, context);
-
- if (Objects.nonNull(heatFileData.getData())) {
- heatFileData.getData().stream().filter(data -> data.getType() == FileData.Type.HEAT_VOL)
- .forEach(data -> translateHeatFile(serviceTemplate, data, context));
+ private ServiceTemplate createMainServiceTemplate(TranslationContext translationContext) {
+ ServiceTemplate mainServiceTemplate = new ServiceTemplate();
+ translationContext.getTranslatedServiceTemplates()
+ .put(Constants.MAIN_TEMPLATE_NAME, mainServiceTemplate);
+ Map<String, String> templateMetadata = new HashMap<>();
+ templateMetadata.put(ToscaConstants.ST_METADATA_TEMPLATE_NAME, Constants.MAIN_TEMPLATE_NAME);
+ mainServiceTemplate.setTosca_definitions_version(ToscaConstants.TOSCA_DEFINITIONS_VERSION);
+ mainServiceTemplate.setMetadata(templateMetadata);
+ mainServiceTemplate.setTopology_template(new TopologyTemplate());
+ mainServiceTemplate.setImports(GlobalTypesGenerator.getGlobalTypesImportList());
+ return mainServiceTemplate;
}
- }
-
- private void handleHeatPseudoParam(String heatFileName, ServiceTemplate serviceTemplate,
- TranslationContext context) {
- Map<String, String> translatedHeatPseudoParam =
- context.getUsedHeatPseudoParams().get(heatFileName);
- if (Objects.nonNull(translatedHeatPseudoParam)) {
- for (String heatPseudoParam : translatedHeatPseudoParam.keySet()) {
- if (!serviceTemplate.getTopology_template().getInputs().containsKey(heatPseudoParam)) {
- ParameterDefinition parameterDefinition = new ParameterDefinition();
- parameterDefinition.setType(PropertyType.STRING.getDisplayName());
- parameterDefinition.setRequired(false);
- String parameterDefinitionId = translatedHeatPseudoParam.get(heatPseudoParam);
- DataModelUtil.addInputParameterToTopologyTemplate(serviceTemplate, parameterDefinitionId,
- parameterDefinition);
+
+ /**
+ * Translate heat file.
+ *
+ * @param serviceTemplate the service template
+ * @param heatFileData the heat file data
+ * @param context the context
+ */
+ public void translateHeatFile(ServiceTemplate serviceTemplate, FileData heatFileData,
+ TranslationContext context) {
+ String heatFileName = heatFileData.getFile();
+ HeatOrchestrationTemplate heatOrchestrationTemplate = new YamlUtil()
+ .yamlToObject(context.getFileContent(heatFileName), HeatOrchestrationTemplate.class);
+
+ translateInputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData, context,
+ heatFileName);
+ translateResources(heatFileName, serviceTemplate, heatOrchestrationTemplate, context);
+ translateOutputParameters(serviceTemplate, heatOrchestrationTemplate, heatFileData,
+ heatFileName, context);
+ createHeatStackGroup(serviceTemplate, heatFileData, heatOrchestrationTemplate, context);
+ handleHeatPseudoParam(heatFileName, serviceTemplate, context);
+
+ if (Objects.nonNull(heatFileData.getData())) {
+ heatFileData.getData().stream().filter(data -> data.getType() == FileData.Type.HEAT_VOL)
+ .forEach(data -> translateHeatFile(serviceTemplate, data, context));
}
- }
}
- }
- private void createHeatStackGroup(ServiceTemplate serviceTemplate, FileData heatFileData,
- HeatOrchestrationTemplate heatOrchestrationTemplate,
- TranslationContext context) {
- ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl();
- final String fileName = heatFileData.getFile();
- final String heatStackGroupId = FileUtils.getFileWithoutExtention(fileName) + "_group";
-
- GroupDefinition groupDefinition = new GroupDefinition();
- groupDefinition.setType(ToscaGroupType.HEAT_STACK);
- groupDefinition.setProperties(new HashMap<>());
- groupDefinition.getProperties()
- .put("heat_file", "../" + toscaFileOutputService.getArtifactsFolderName() + "/" + fileName);
- String hotDescription = heatOrchestrationTemplate.getDescription();
- if (hotDescription != null && !hotDescription.isEmpty()) {
- groupDefinition.getProperties().put(Constants.DESCRIPTION_PROPERTY_NAME, hotDescription);
+ private void handleHeatPseudoParam(String heatFileName, ServiceTemplate serviceTemplate,
+ TranslationContext context) {
+ Map<String, String> translatedHeatPseudoParam =
+ context.getUsedHeatPseudoParams().get(heatFileName);
+ if (Objects.nonNull(translatedHeatPseudoParam)) {
+ for (String heatPseudoParam : translatedHeatPseudoParam.keySet()) {
+ if (!serviceTemplate.getTopology_template().getInputs().containsKey(heatPseudoParam)) {
+ ParameterDefinition parameterDefinition = new ParameterDefinition();
+ parameterDefinition.setType(PropertyType.STRING.getDisplayName());
+ parameterDefinition.setRequired(false);
+ String parameterDefinitionId = translatedHeatPseudoParam.get(heatPseudoParam);
+ DataModelUtil.addInputParameterToTopologyTemplate(serviceTemplate, parameterDefinitionId,
+ parameterDefinition);
+ }
+ }
+ }
}
- groupDefinition.setMembers(new ArrayList<>());
- Set<String> heatStackGroupMembersIds = getHeatStackGroupMembers(fileName,
- serviceTemplate, context);
- if (CollectionUtils.isEmpty(heatStackGroupMembersIds)) {
- return; //not creating a group when no resources are present in the heat input
+
+ private void createHeatStackGroup(ServiceTemplate serviceTemplate, FileData heatFileData,
+ HeatOrchestrationTemplate heatOrchestrationTemplate,
+ TranslationContext context) {
+ ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl();
+ final String fileName = heatFileData.getFile();
+ final String heatStackGroupId = FileUtils.getFileWithoutExtention(fileName) + "_group";
+
+ GroupDefinition groupDefinition = new GroupDefinition();
+ groupDefinition.setType(ToscaGroupType.HEAT_STACK);
+ groupDefinition.setProperties(new HashMap<>());
+ groupDefinition.getProperties()
+ .put("heat_file", "../" + toscaFileOutputService.getArtifactsFolderName() + "/" + fileName);
+ String hotDescription = heatOrchestrationTemplate.getDescription();
+ if (hotDescription != null && !hotDescription.isEmpty()) {
+ groupDefinition.getProperties().put(Constants.DESCRIPTION_PROPERTY_NAME, hotDescription);
+ }
+ groupDefinition.setMembers(new ArrayList<>());
+ Set<String> heatStackGroupMembersIds = getHeatStackGroupMembers(fileName,
+ serviceTemplate, context);
+ if (CollectionUtils.isEmpty(heatStackGroupMembersIds)) {
+ return; //not creating a group when no resources are present in the heat input
+ }
+ groupDefinition.getMembers().addAll(heatStackGroupMembersIds);
+ DataModelUtil
+ .addGroupDefinitionToTopologyTemplate(serviceTemplate, heatStackGroupId, groupDefinition);
}
- groupDefinition.getMembers().addAll(heatStackGroupMembersIds);
- DataModelUtil
- .addGroupDefinitionToTopologyTemplate(serviceTemplate, heatStackGroupId, groupDefinition);
- }
- private Set<String> getHeatStackGroupMembers(String heatFileName,
- ServiceTemplate serviceTemplate,
- TranslationContext context){
+ private Set<String> getHeatStackGroupMembers(String heatFileName,
+ ServiceTemplate serviceTemplate,
+ TranslationContext context) {
+
+ Map<String, Set<String>> heatStackGroupMembers = context.getHeatStackGroupMembers();
+ Set<String> groupMembers = MapUtils.isEmpty(heatStackGroupMembers) ? new HashSet<>()
+ : heatStackGroupMembers.get(heatFileName);
+
+ if (CollectionUtils.isEmpty(groupMembers)) {
+ return new HashSet<>();
+ }
+
+ Set<String> updatedMembersIds = new HashSet<>();
- Map<String, Set<String>> heatStackGroupMembers = context.getHeatStackGroupMembers();
- Set<String> groupMembers = MapUtils.isEmpty(heatStackGroupMembers) ? new HashSet<>()
- : heatStackGroupMembers.get(heatFileName);
+ groupMembers.forEach(member -> {
+ if (Objects.nonNull(DataModelUtil.getNodeTemplate(serviceTemplate, member))) {
+ updatedMembersIds.add(member);
+ } else {
+ updateSubstitutableGroupMemberId(heatFileName, serviceTemplate, updatedMembersIds);
+ }
+ });
- if(CollectionUtils.isEmpty(groupMembers)){
- return new HashSet<>();
+ return updatedMembersIds;
}
- Set<String> updatedMembersIds = new HashSet<>();
-
- groupMembers.forEach(member -> {
- if (Objects.nonNull(DataModelUtil.getNodeTemplate(serviceTemplate, member))) {
- updatedMembersIds.add(member);
- } else {
- updateSubstitutableGroupMemberId(heatFileName, serviceTemplate, updatedMembersIds);
- }
- });
-
- return updatedMembersIds;
- }
-
- private void updateSubstitutableGroupMemberId(String heatFileName,
- ServiceTemplate serviceTemplate,
- Set<String> updatedMembersIds) {
- Optional<String> substitutableGroupMemberId =
- ToscaUtil.getSubstitutableGroupMemberId(heatFileName, serviceTemplate);
-
- substitutableGroupMemberId.ifPresent(updatedMembersIds::add);
- }
-
- private void translateInputParameters(ServiceTemplate serviceTemplate,
- HeatOrchestrationTemplate heatOrchestrationTemplate,
- FileData heatFileData, TranslationContext context,
- String heatFileName) {
- if (heatOrchestrationTemplate.getParameters() == null) {
- return;
+ private void updateSubstitutableGroupMemberId(String heatFileName,
+ ServiceTemplate serviceTemplate,
+ Set<String> updatedMembersIds) {
+ Optional<String> substitutableGroupMemberId =
+ ToscaUtil.getSubstitutableGroupMemberId(heatFileName, serviceTemplate);
+
+ substitutableGroupMemberId.ifPresent(updatedMembersIds::add);
}
- Map<String, ParameterDefinition> parameterDefinitionMap =
- TranslatorHeatToToscaParameterConverter
- .parameterConverter(serviceTemplate,heatOrchestrationTemplate.getParameters(),
- heatOrchestrationTemplate, heatFileName, context);
- Environment heatEnvFile = getHeatEnvFile(heatFileData, context);
- Map<String, Object> parameters = heatEnvFile.getParameters();
- Object parameterValue;
- if (parameters != null) {
- for (Map.Entry<String, ParameterDefinition> entry : parameterDefinitionMap.entrySet()) {
- String paramName = entry.getKey();
- parameterValue = parameters.get(paramName);
- if (parameterValue != null) {
- entry.getValue().set_default(TranslatorHeatToToscaParameterConverter
- .getToscaParameterDefaultValue(null, null, parameterValue, entry.getValue().getType(),
- heatFileName, heatOrchestrationTemplate, context));
+ private void translateInputParameters(ServiceTemplate serviceTemplate,
+ HeatOrchestrationTemplate heatOrchestrationTemplate,
+ FileData heatFileData, TranslationContext context,
+ String heatFileName) {
+ if (heatOrchestrationTemplate.getParameters() == null) {
+ return;
+ }
+
+ Map<String, ParameterDefinition> parameterDefinitionMap =
+ TranslatorHeatToToscaParameterConverter
+ .parameterConverter(serviceTemplate, heatOrchestrationTemplate.getParameters(),
+ heatOrchestrationTemplate, heatFileName, context);
+ Environment heatEnvFile = getHeatEnvFile(heatFileData, context);
+ Map<String, Object> parameters = heatEnvFile.getParameters();
+ Object parameterValue;
+ if (parameters != null) {
+ for (Map.Entry<String, ParameterDefinition> entry : parameterDefinitionMap.entrySet()) {
+ String paramName = entry.getKey();
+ parameterValue = parameters.get(paramName);
+ if (parameterValue != null) {
+ entry.getValue().set_default(TranslatorHeatToToscaParameterConverter
+ .getToscaParameterDefaultValue(null, null, parameterValue, entry.getValue().getType(),
+ heatFileName, heatOrchestrationTemplate, context));
+ }
+ }
+ }
+
+
+ Map<String, ParameterDefinition> inputs = serviceTemplate.getTopology_template().getInputs();
+ if (Objects.isNull(inputs)) {
+ serviceTemplate.getTopology_template().setInputs(parameterDefinitionMap);
+ } else {
+ setInputs(inputs, parameterDefinitionMap);
+
}
- }
+
}
- Map<String, ParameterDefinition> inputs = serviceTemplate.getTopology_template().getInputs();
- if (Objects.isNull(inputs)) {
- serviceTemplate.getTopology_template().setInputs(parameterDefinitionMap);
- } else {
- inputs.putAll(parameterDefinitionMap);
+ private void setInputs(Map<String, ParameterDefinition> inputs, Map<String, ParameterDefinition> newParameters) {
+
+ updateAnnotations(inputs, newParameters);
+ inputs.putAll(newParameters);
+
}
- }
-
- private void translateOutputParameters(ServiceTemplate serviceTemplate,
- HeatOrchestrationTemplate heatOrchestrationTemplate,
- FileData heatFileData, String heatFileName,
- TranslationContext context) {
- if (heatOrchestrationTemplate.getOutputs() == null) {
- return;
+
+ private void updateAnnotations(Map<String, ParameterDefinition> inputParameters, Map<String, ParameterDefinition> newParameters) {
+
+ if (Objects.nonNull(newParameters.entrySet())) {
+ newParameters.entrySet().stream().filter(stringParameterDefinitionEntry ->
+ inputParameters.containsKey(stringParameterDefinitionEntry.getKey()) &&
+ isHasAnnotation(inputParameters, stringParameterDefinitionEntry)).
+ forEach(stringParameterDefinitionEntry -> getVFModulesList(stringParameterDefinitionEntry.getValue()).
+ addAll(getVFModulesList(inputParameters.get(stringParameterDefinitionEntry.getKey()))));
+ }
}
- Map<String, ParameterDefinition> parameterDefinitionMap =
- TranslatorHeatToToscaParameterConverter
- .parameterOutputConverter(serviceTemplate,heatOrchestrationTemplate.getOutputs(),
- heatOrchestrationTemplate, heatFileName, context);
- if (serviceTemplate.getTopology_template().getOutputs() != null) {
- serviceTemplate.getTopology_template().getOutputs().putAll(parameterDefinitionMap);
- } else {
- serviceTemplate.getTopology_template().setOutputs(parameterDefinitionMap);
+
+ private boolean isHasAnnotation(Map<String, ParameterDefinition> inputParameters, Map.Entry<String, ParameterDefinition> newParameterSet) {
+ ParameterDefinitionExt inputParameter = (ParameterDefinitionExt) inputParameters.get(newParameterSet.getKey());
+ ParameterDefinitionExt newParameter = (ParameterDefinitionExt) newParameterSet.getValue();
+ return inputParameter.getAnnotations() != null && newParameter.getAnnotations() != null;
}
- if (heatFileData.getBase() != null && heatFileData.getBase().equals(true)) {
- updateSharedResources(serviceTemplate, heatFileName, heatOrchestrationTemplate,
- heatOrchestrationTemplate.getOutputs(), context);
+ private List getVFModulesList(ParameterDefinition param) {
+ ParameterDefinitionExt parameterDefinitionExt = (ParameterDefinitionExt) param;
+ return (List) parameterDefinitionExt.getAnnotations().get(ToscaConstants.SOURCE_ANNOTATION_ID).getProperties().
+ get(ToscaConstants.VF_MODULE_LABEL_PROPERTY_NAME);
}
- }
-
- private void updateSharedResources(ServiceTemplate serviceTemplate, String heatFileName,
- HeatOrchestrationTemplate heatOrchestrationTemplate,
- Map<String, Output> outputs, TranslationContext context) {
- for (Map.Entry<String, Output> parameter : outputs.entrySet()) {
- Optional<AttachedResourceId> attachedSharedResourceId = HeatToToscaUtil
- .extractAttachedResourceId(heatFileName, heatOrchestrationTemplate, context,
- parameter.getValue().getValue());
- if (attachedSharedResourceId.isPresent() && attachedSharedResourceId.get().isGetResource()
- && attachedSharedResourceId.get().getTranslatedId() != null) {
- String sharedTranslatedResourceId =
- attachedSharedResourceId.get().getTranslatedId().toString();
- updateSharedResource(serviceTemplate, context, parameter, sharedTranslatedResourceId,
- heatOrchestrationTemplate.getResources()
- .get(attachedSharedResourceId.get().getEntityId()));
- } else {
- Optional<String> contrailSharedResourceId = HeatToToscaUtil
- .extractContrailGetResourceAttachedHeatResourceId(parameter.getValue().getValue());
- if (contrailSharedResourceId.isPresent()
- && context.getTranslatedIds().get(heatFileName).get(contrailSharedResourceId.get())
- != null) {
- String sharedTranslatedResourceId = context.getTranslatedIds().get(heatFileName).get
- (contrailSharedResourceId.get());
- ConsolidationDataUtil.removeSharedResource(serviceTemplate, heatOrchestrationTemplate,
- context, parameter.getKey(),contrailSharedResourceId.get(), sharedTranslatedResourceId);
- updateSharedResource(serviceTemplate, context, parameter,sharedTranslatedResourceId,
- heatOrchestrationTemplate.getResources().get(contrailSharedResourceId.get()));
+
+ private void translateOutputParameters(ServiceTemplate serviceTemplate,
+ HeatOrchestrationTemplate heatOrchestrationTemplate,
+ FileData heatFileData, String heatFileName,
+ TranslationContext context) {
+ if (heatOrchestrationTemplate.getOutputs() == null) {
+ return;
+ }
+ Map<String, ParameterDefinition> parameterDefinitionMap =
+ TranslatorHeatToToscaParameterConverter
+ .parameterOutputConverter(serviceTemplate, heatOrchestrationTemplate.getOutputs(),
+ heatOrchestrationTemplate, heatFileName, context);
+ if (serviceTemplate.getTopology_template().getOutputs() != null) {
+ serviceTemplate.getTopology_template().getOutputs().putAll(parameterDefinitionMap);
+ } else {
+ serviceTemplate.getTopology_template().setOutputs(parameterDefinitionMap);
}
- }
- }
- if (serviceTemplate.getTopology_template().getOutputs() != null
- && serviceTemplate.getTopology_template().getOutputs().size() == 0) {
- serviceTemplate.getTopology_template().setOutputs(null);
- }
- }
- private void updateSharedResource(ServiceTemplate serviceTemplate, TranslationContext context,
- Map.Entry<String, Output> paramName,
- String sharedTranslatedResourceId, Resource resource) {
- context.addHeatSharedResourcesByParam(paramName.getKey(), sharedTranslatedResourceId, resource);
- serviceTemplate.getTopology_template().getOutputs().remove(paramName.getKey());
- }
+ if (heatFileData.getBase() != null && heatFileData.getBase().equals(true)) {
+ updateSharedResources(serviceTemplate, heatFileName, heatOrchestrationTemplate,
+ heatOrchestrationTemplate.getOutputs(), context);
+ }
+ }
- private void translateResources(String heatFileName, ServiceTemplate serviceTemplate,
- HeatOrchestrationTemplate heatOrchestrationTemplate,
- TranslationContext context) {
- if(MapUtils.isEmpty(heatOrchestrationTemplate.getResources())){
- return;
+ private void updateSharedResources(ServiceTemplate serviceTemplate, String heatFileName,
+ HeatOrchestrationTemplate heatOrchestrationTemplate,
+ Map<String, Output> outputs, TranslationContext context) {
+ for (Map.Entry<String, Output> parameter : outputs.entrySet()) {
+ Optional<AttachedResourceId> attachedSharedResourceId = HeatToToscaUtil
+ .extractAttachedResourceId(heatFileName, heatOrchestrationTemplate, context,
+ parameter.getValue().getValue());
+ if (attachedSharedResourceId.isPresent() && attachedSharedResourceId.get().isGetResource()
+ && attachedSharedResourceId.get().getTranslatedId() != null) {
+ String sharedTranslatedResourceId =
+ attachedSharedResourceId.get().getTranslatedId().toString();
+ updateSharedResource(serviceTemplate, context, parameter, sharedTranslatedResourceId,
+ heatOrchestrationTemplate.getResources()
+ .get(attachedSharedResourceId.get().getEntityId()));
+ } else {
+ Optional<String> contrailSharedResourceId = HeatToToscaUtil
+ .extractContrailGetResourceAttachedHeatResourceId(parameter.getValue().getValue());
+ if (contrailSharedResourceId.isPresent()
+ && context.getTranslatedIds().get(heatFileName).get(contrailSharedResourceId.get())
+ != null) {
+ String sharedTranslatedResourceId = context.getTranslatedIds().get(heatFileName).get
+ (contrailSharedResourceId.get());
+ ConsolidationDataUtil.removeSharedResource(serviceTemplate, heatOrchestrationTemplate,
+ context, parameter.getKey(), contrailSharedResourceId.get(), sharedTranslatedResourceId);
+ updateSharedResource(serviceTemplate, context, parameter, sharedTranslatedResourceId,
+ heatOrchestrationTemplate.getResources().get(contrailSharedResourceId.get()));
+ }
+ }
+ }
+ if (serviceTemplate.getTopology_template().getOutputs() != null
+ && serviceTemplate.getTopology_template().getOutputs().size() == 0) {
+ serviceTemplate.getTopology_template().setOutputs(null);
+ }
}
- for (String resourceId : heatOrchestrationTemplate.getResources().keySet()) {
- Resource resource = heatOrchestrationTemplate.getResources().get(resourceId);
- if (resource == null) {
- throw new CoreException(
- new ResourceNotFoundInHeatFileErrorBuilder(resourceId, heatFileName).build());
- }
- ResourceTranslationFactory.getInstance(resource)
- .translateResource(heatFileName, serviceTemplate, heatOrchestrationTemplate, resource,
- resourceId, context);
+ private void updateSharedResource(ServiceTemplate serviceTemplate, TranslationContext context,
+ Map.Entry<String, Output> paramName,
+ String sharedTranslatedResourceId, Resource resource) {
+ context.addHeatSharedResourcesByParam(paramName.getKey(), sharedTranslatedResourceId, resource);
+ serviceTemplate.getTopology_template().getOutputs().remove(paramName.getKey());
}
- }
- private Environment getHeatEnvFile(FileData heatFileData, TranslationContext context) {
- List<FileData> fileRelatedDataList = heatFileData.getData();
- if (fileRelatedDataList == null) {
- return new Environment();
+ private void translateResources(String heatFileName, ServiceTemplate serviceTemplate,
+ HeatOrchestrationTemplate heatOrchestrationTemplate,
+ TranslationContext context) {
+ if (MapUtils.isEmpty(heatOrchestrationTemplate.getResources())) {
+ return;
+ }
+
+ for (String resourceId : heatOrchestrationTemplate.getResources().keySet()) {
+ Resource resource = heatOrchestrationTemplate.getResources().get(resourceId);
+ if (resource == null) {
+ throw new CoreException(
+ new ResourceNotFoundInHeatFileErrorBuilder(resourceId, heatFileName).build());
+ }
+ ResourceTranslationFactory.getInstance(resource)
+ .translateResource(heatFileName, serviceTemplate, heatOrchestrationTemplate, resource,
+ resourceId, context);
+ }
}
- for (FileData fileRelatedData : fileRelatedDataList) {
- if (fileRelatedData.getType().equals(FileData.Type.HEAT_ENV)) {
- return new YamlUtil().yamlToObject(context.getFileContent(fileRelatedData.getFile()),
- Environment.class);
- }
+
+ private Environment getHeatEnvFile(FileData heatFileData, TranslationContext context) {
+ List<FileData> fileRelatedDataList = heatFileData.getData();
+ if (fileRelatedDataList == null) {
+ return new Environment();
+ }
+ for (FileData fileRelatedData : fileRelatedDataList) {
+ if (fileRelatedData.getType().equals(FileData.Type.HEAT_ENV)) {
+ return new YamlUtil().yamlToObject(context.getFileContent(fileRelatedData.getFile()),
+ Environment.class);
+ }
+ }
+ return new Environment();
}
- return new Environment();
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
index 35b617be99..930a2dee58 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/mapping/TranslatorHeatToToscaParameterConverter.java
@@ -1,42 +1,37 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2018 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.translator.services.heattotosca.mapping;
import org.apache.commons.collections4.MapUtils;
+import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
import org.openecomp.sdc.heat.datatypes.model.Output;
import org.openecomp.sdc.heat.datatypes.model.Parameter;
-import org.openecomp.sdc.tosca.datatypes.model.Constraint;
-import org.openecomp.sdc.tosca.datatypes.model.EntrySchema;
-import org.openecomp.sdc.tosca.datatypes.model.ParameterDefinition;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.openecomp.sdc.tosca.datatypes.extend.ToscaAnnotationType;
+import org.openecomp.sdc.tosca.datatypes.model.*;
+import org.openecomp.sdc.tosca.datatypes.model.heatextend.AnnotationDefinition;
import org.openecomp.sdc.tosca.datatypes.model.heatextend.ParameterDefinitionExt;
+import org.openecomp.sdc.tosca.services.ToscaConstants;
+import org.openecomp.sdc.tosca.services.ToscaUtil;
import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
import org.openecomp.sdc.translator.services.heattotosca.FunctionTranslationFactory;
+import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class TranslatorHeatToToscaParameterConverter {
@@ -73,11 +68,9 @@ public class TranslatorHeatToToscaParameterConverter {
String heatFileName, TranslationContext context) {
Map<String, ParameterDefinition> parameterDefinitionMap = new HashMap<>();
for (Map.Entry<String, Parameter> entry : parameters.entrySet()) {
- //parameterDefinitionMap.put(entry.getKey()+"_"+ FileUtils.getFileWithoutExtention
- // (heatFileName),getToscaParameter(entry.getValue(), heatOrchestrationTemplate,
- // heatFileName, context));
- parameterDefinitionMap.put(entry.getKey(),
- getToscaParameter(serviceTemplate,entry.getKey(), entry.getValue(),
+ String heatParamName = entry.getKey();
+ parameterDefinitionMap.put(heatParamName,
+ getToscaParameter(serviceTemplate,heatParamName, entry.getValue(),
heatOrchestrationTemplate,
heatFileName, context));
}
@@ -118,7 +111,7 @@ public class TranslatorHeatToToscaParameterConverter {
* @return the tosca parameter
*/
public static ParameterDefinitionExt getToscaParameter(ServiceTemplate serviceTemplate,
- String parameterName,
+ String heatParameterName,
Parameter heatParameter,
HeatOrchestrationTemplate
heatOrchestrationTemplate,
@@ -131,14 +124,48 @@ public class TranslatorHeatToToscaParameterConverter {
toscaParameter.setLabel(heatParameter.getLabel());
toscaParameter.setDescription(heatParameter.getDescription());
toscaParameter.set_default(
- getToscaParameterDefaultValue(serviceTemplate, parameterName, heatParameter.get_default(),
+ getToscaParameterDefaultValue(serviceTemplate, heatParameterName, heatParameter.get_default(),
toscaParameter.getType(), heatFileName, heatOrchestrationTemplate, context));
toscaParameter.setHidden(heatParameter.isHidden());
toscaParameter.setImmutable(heatParameter.isImmutable());
toscaParameter.setConstraints(getToscaConstrains(heatParameter.getConstraints()));
+ Optional<Map<String, AnnotationDefinition>> annotations = getToscaAnnotations(context, serviceTemplate, heatFileName, heatParameterName);
+ annotations.ifPresent(ant->toscaParameter.setAnnotations(annotations.get()));
+
+
return toscaParameter;
}
+ private static Optional<Map<String, AnnotationDefinition> > getToscaAnnotations (TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName, String heatParameterName){
+
+ if(!isAnnotationRequired(context, serviceTemplate, heatFileName)){
+ return Optional.empty();
+ }
+
+ AnnotationDefinition annotationDefinition = new AnnotationDefinition();
+ annotationDefinition.setType(ToscaAnnotationType.SOURCE);
+ annotationDefinition.setProperties(new HashMap<>());
+ List<String> vfModuleList = new ArrayList<>();
+ vfModuleList.add( FileUtils.getFileWithoutExtention(heatFileName));
+ annotationDefinition.getProperties().put(ToscaConstants.VF_MODULE_LABEL_PROPERTY_NAME, vfModuleList);
+ annotationDefinition.getProperties().put(ToscaConstants.SOURCE_TYPE_PROPERTY_NAME, ToscaConstants.HEAT_SOURCE_TYPE);
+ annotationDefinition.getProperties().put(ToscaConstants.PARAM_NAME_PROPERTY_NAME, heatParameterName);
+ Map<String, AnnotationDefinition> annotationMap = new HashMap<>();
+ annotationMap.put(ToscaConstants.SOURCE_ANNOTATION_ID, annotationDefinition);
+ return Optional.of(annotationMap);
+
+ }
+
+ private static boolean isAnnotationRequired(TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName){
+ return HeatToToscaUtil.shouldAnnotationsToBeAdded() && !isNestedServiceTemplate(context, serviceTemplate, heatFileName);
+ }
+
+ private static boolean isNestedServiceTemplate(TranslationContext context, ServiceTemplate serviceTemplate, String heatFileName) {
+ String serviceTemplateFileName = ToscaUtil.getServiceTemplateFileName(serviceTemplate.getMetadata());
+ return HeatToToscaUtil.isHeatFileNested(context, heatFileName) || context.getNestedHeatFileName().containsKey(serviceTemplateFileName);
+ }
+
+
/**
* Gets tosca output parameter.
*
@@ -148,7 +175,7 @@ public class TranslatorHeatToToscaParameterConverter {
* @param context the context
* @return the tosca output parameter
*/
- public static ParameterDefinitionExt getToscaOutputParameter(ServiceTemplate serviceTemplate,
+ private static ParameterDefinitionExt getToscaOutputParameter(ServiceTemplate serviceTemplate,
String parameterName,
Output heatOutputParameter,
HeatOrchestrationTemplate
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/impl/heattotosca/parameters/HeatParameterConversionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/impl/heattotosca/parameters/HeatParameterConversionTest.java
index 5f2c3691c2..248c0c4378 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/impl/heattotosca/parameters/HeatParameterConversionTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/impl/heattotosca/parameters/HeatParameterConversionTest.java
@@ -1,37 +1,64 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.translator.impl.heattotosca.parameters;
+import org.junit.Before;
import org.junit.Test;
import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.BaseResourceTranslationTest;
+import java.io.IOException;
+
public class HeatParameterConversionTest extends BaseResourceTranslationTest {
- {
- inputFilesPath = "/mock/heat/parameters/inputs";
- outputFilesPath = "/mock/heat/parameters/expectedoutputfiles";
+ @Override
+ @Before
+ public void setUp() throws IOException {
+ // do not delete this function. it prevents the superclass setup from running
}
@Test
public void testTranslate() throws Exception {
+ inputFilesPath = "/mock/heat/parameters/single/inputs";
+ outputFilesPath = "/mock/heat/parameters/single/expectedoutputfiles";
+ initTranslatorAndTranslate();
+ testTranslation();
+ }
+
+ @Test
+ public void testTranslateAllBaseMultipleHeat() throws Exception {
+ inputFilesPath = "/mock/heat/parameters/allHeatsAreBase/inputs";
+ outputFilesPath = "/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles";
+ initTranslatorAndTranslate();
+ testTranslation();
+ }
+
+ @Test
+ public void testTranslateMultipleHeatWithNested() throws Exception {
+ inputFilesPath = "/mock/heat/parameters/multipleHeatWithNested/inputs";
+ outputFilesPath = "/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles";
+ initTranslatorAndTranslate();
+ testTranslation();
+ }
+
+ @Test
+ public void testTranslateNestedWithAssociatedHeat() throws Exception {
+ inputFilesPath = "/mock/heat/parameters/nestedWithAssociatedHeat/inputs";
+ outputFilesPath = "/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles";
+ initTranslatorAndTranslate();
testTranslation();
}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
index d97128eea3..32315d1b33 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
@@ -42,7 +42,7 @@ public class GlobalTypesServiceTemplatesTest {
Map<String, ServiceTemplate> globalTypesServiceTemplates =
getGlobalTypesServiceTemplates(OnboardingTypesEnum.CSAR);
Assert.assertNotNull(globalTypesServiceTemplates);
- Assert.assertEquals(globalTypesServiceTemplates.size(), 24);
+ Assert.assertEquals(globalTypesServiceTemplates.size(), 25);
Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
List<String> onapGlobalTypes = globalTypeFolders.stream()
.filter(resourceKey -> resourceKey.contains("onap"))
@@ -56,7 +56,7 @@ public class GlobalTypesServiceTemplatesTest {
Map<String, ServiceTemplate> globalTypesServiceTemplates =
getGlobalTypesServiceTemplates(OnboardingTypesEnum.ZIP);
Assert.assertNotNull(globalTypesServiceTemplates);
- Assert.assertEquals(globalTypesServiceTemplates.size(), 19);
+ Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
List<String> onapGlobalTypes = globalTypeFolders.stream()
.filter(resourceKey -> resourceKey.contains("onap"))
@@ -69,7 +69,7 @@ public class GlobalTypesServiceTemplatesTest {
Map<String, ServiceTemplate> globalTypesServiceTemplates =
getGlobalTypesServiceTemplates(OnboardingTypesEnum.MANUAL);
Assert.assertNotNull(globalTypesServiceTemplates);
- Assert.assertEquals(globalTypesServiceTemplates.size(), 19);
+ Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
List<String> onapGlobalTypes = globalTypeFolders.stream()
.filter(resourceKey -> resourceKey.contains("onap"))
@@ -82,7 +82,7 @@ public class GlobalTypesServiceTemplatesTest {
Map<String, ServiceTemplate> globalTypesServiceTemplates =
getGlobalTypesServiceTemplates(OnboardingTypesEnum.NONE);
Assert.assertNotNull(globalTypesServiceTemplates);
- Assert.assertEquals(globalTypesServiceTemplates.size(), 19);
+ Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
List<String> onapGlobalTypes = globalTypeFolders.stream()
.filter(resourceKey -> resourceKey.contains("onap"))
@@ -90,4 +90,4 @@ public class GlobalTypesServiceTemplatesTest {
Assert.assertEquals(onapGlobalTypes.size(), 0);
}
-} \ No newline at end of file
+}
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/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java
index f5e1ebbe76..8126d2967c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java
@@ -1,9 +1,6 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -15,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation;
@@ -66,17 +62,25 @@ public class BaseFullTranslationTest {
protected static TestFeatureManager manager;
@BeforeClass
- public static void enableForwarderFeature(){
+ public static void enableToggleableFeatures(){
manager = new TestFeatureManager(ToggleableFeature.class);
if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) {
manager.enable(ToggleableFeature.FORWARDER_CAPABILITY);
}
+ if (!ToggleableFeature.ANNOTATIONS.isActive()) {
+ manager.enable(ToggleableFeature.ANNOTATIONS);
+ }
+ if(!ToggleableFeature.VLAN_TAGGING.isActive()) {
+ manager.enable(ToggleableFeature.VLAN_TAGGING);
+ }
}
@AfterClass
- public static void disableForwarderFeature() {
+ public static void disableToggleableFeatures() {
manager.disable(ToggleableFeature.FORWARDER_CAPABILITY);
+ manager.disable(ToggleableFeature.ANNOTATIONS);
+ manager.disable(ToggleableFeature.VLAN_TAGGING);
manager = null;
TestFeatureManagerProvider.setFeatureManager(null);
}
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/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
index 2ef72acd8e..4dc1612893 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
@@ -8,7 +8,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on a "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -96,20 +96,26 @@ public class BaseResourceTranslationTest {
protected static TestFeatureManager manager;
@BeforeClass
- public static void enableForwarderFeature(){
+ public static void enableToggleableFeatures(){
manager = new TestFeatureManager(ToggleableFeature.class);
if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) {
manager.enable(ToggleableFeature.FORWARDER_CAPABILITY);
}
- }
+ if(!ToggleableFeature.ANNOTATIONS.isActive()) {
+ manager.enable(ToggleableFeature.ANNOTATIONS);
+ }
+ if(!ToggleableFeature.VLAN_TAGGING.isActive()){
+ manager.enable(ToggleableFeature.VLAN_TAGGING);
+ }
+ }
@AfterClass
- public static void disableForwarderFeature() {
- if (manager != null) {
- manager.disable(ToggleableFeature.FORWARDER_CAPABILITY);
- manager = null;
- }
+ public static void disableToggleableFeatures() {
+ manager.disable(ToggleableFeature.FORWARDER_CAPABILITY);
+ manager.disable(ToggleableFeature.ANNOTATIONS);
+ manager.disable(ToggleableFeature.VLAN_TAGGING);
+ manager = null;
TestFeatureManagerProvider.setFeatureManager(null);
}
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/ContrailV2VlanToInterfaceResourceConnectionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
index a6876fa00f..5d73a300e8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
@@ -34,13 +34,6 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc
// do not delete this function. it prevents the superclass setup from running
}
- @BeforeClass
- public static void enableVLANTagging() {
- manager = new TestFeatureManager(ToggleableFeature.class);
- manager.enable(ToggleableFeature.VLAN_TAGGING);
- TestFeatureManagerProvider.setFeatureManager(manager);
- }
-
@Test
public void testTranslateVlanToInterfaceNestedConnection() throws Exception {
inputFilesPath =
@@ -62,10 +55,4 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc
testTranslation();
}
- @AfterClass
- public static void disableVLANTagging() {
- manager.disable(ToggleableFeature.VLAN_TAGGING);
- manager = null;
- TestFeatureManagerProvider.setFeatureManager(null);
- }
}
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/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java
index 0776692e03..2af3f85c5d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationContrailV2VlanSubInterfaceImplTest.java
@@ -38,12 +38,6 @@ public class ResourceTranslationContrailV2VlanSubInterfaceImplTest extends
// do not delete this function. it prevents the superclass setup from running
}
- @BeforeClass
- public static void enableVLANTagging() {
- manager.enable(ToggleableFeature.VLAN_TAGGING);
- TestFeatureManagerProvider.setFeatureManager(manager);
- }
-
@Test
public void testTranslateVlanSubInterfaceWithGetResource() throws Exception {
inputFilesPath = "/mock/services/heattotosca/contrailv2Vlan/oneInterface/inputfiles";
@@ -60,11 +54,4 @@ public class ResourceTranslationContrailV2VlanSubInterfaceImplTest extends
initTranslatorAndTranslate();
testTranslation();
}
-
- @AfterClass
- public static void disableVLANTagging() {
- manager.disable(ToggleableFeature.VLAN_TAGGING);
- manager = null;
- TestFeatureManagerProvider.setFeatureManager(null);
- }
}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml
index d61871c767..b9bc90184c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,15 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
entry_schema:
@@ -20,18 +29,45 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
oam_net_gw:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
entry_schema:
@@ -40,12 +76,30 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
cps_net_ips:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
entry_schema:
@@ -54,12 +108,30 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
pcm_volumes:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
entry_schema:
@@ -68,30 +140,75 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
cps_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
oam_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
oam_net_name:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
node_templates:
@@ -213,4 +330,4 @@ topology_template:
description: heat template that creates PCRF Cluman stack
members:
- server_pcm_004
- - server_pcm_003 \ No newline at end of file
+ - server_pcm_003
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml
index 8295fecd44..5545c178b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF_MODULE instance
vf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_name
type: string
description: The VF Name; defaults to VMVM for the virtual MVM VNF.
constraints:
@@ -25,11 +41,27 @@ topology_template:
cloud_zone_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: cloud_zone_id
type: string
description: The cloud zone for this VF instance
vf_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_instance_num
type: string
description: The number for this VF instance
constraints:
@@ -39,11 +71,27 @@ topology_template:
virtual_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: virtual_mgmt_ip_0
type: string
description: Virtual management network ip address
mvs_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mvs_mgmt_ip_0
type: list
description: List of Management network IP addresses for IPv4
entry_schema:
@@ -51,6 +99,14 @@ topology_template:
flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: flavor
type: string
description: Server flavor
constraints: [
@@ -58,6 +114,14 @@ topology_template:
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: key_name
type: string
description: SSH key name
constraints: [
@@ -65,11 +129,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: availability_zone_0
type: list
description: List of Availability Zone IDs or Names
entry_schema:
@@ -77,6 +157,14 @@ topology_template:
mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mgmt_net_id
type: string
description: Neutron UUID for the Management network
constraints: [
@@ -84,6 +172,14 @@ topology_template:
vm_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vm_instance_num
type: list
description: VM instance number list must be a list of three-digit numeric value
entry_schema:
@@ -91,11 +187,27 @@ topology_template:
bootimage:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: bootimage
type: string
description: Master bootimage volume id
sec_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: sec_groups
type: list
description: Security groups
entry_schema:
@@ -103,6 +215,14 @@ topology_template:
vf_component:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_component
type: string
description: The component that this VF instance is running
constraints:
@@ -112,6 +232,14 @@ topology_template:
num_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: num_instances
type: float
description: number of instance of the VF_module
node_templates:
@@ -213,4 +341,4 @@ topology_template:
Metaswitch MVS (Metaview Server)
members:
- mvs_modules
- - mvs_modules_same_nested_heat_file_no_count \ No newline at end of file
+ - mvs_modules_same_nested_heat_file_no_count
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml
index ffbd020e31..3c41ae022e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,21 +12,55 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
shared_security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_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
+ - base
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
shared_security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_id1
type: string
description: network name of jsa log network
node_templates:
@@ -241,4 +275,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- packet_mirror_network
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
index 66880be377..aec14250c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,21 +12,55 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
shared_security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_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
+ - base
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
shared_security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_id1
type: string
description: network name of jsa log network
node_templates:
@@ -238,4 +272,4 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml
index 2fbec0c498..5d0e7411e4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumelocal/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
not_null:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: not_null
type: string
node_templates:
server_pcm_001:
@@ -38,4 +46,4 @@ topology_template:
description: heat template that creates PCRF Cluman stack
members:
- server_pcm_001
- - nove_001_vol \ No newline at end of file
+ - nove_001_vol
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml
index b6d5633203..f18f8feeca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedvolumeseperatefile/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,11 +11,28 @@ topology_template:
not_null:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ - volume
+ source_type: HEAT
+ param_name: not_null
type: string
nove_001_vol:
label: volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: nove_001_vol
type: string
description: volume name
node_templates:
@@ -45,4 +62,4 @@ topology_template:
properties:
heat_file: ../Artifacts/volume.yaml
members:
- - nove_001_vol \ No newline at end of file
+ - nove_001_vol
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml
index 1993eeaf1a..c96d74e7d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nestedwithoutNodeTemplates/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
ssc_a_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_name_0
type: string
description: Name of VM A of SSC
constraints:
@@ -18,6 +26,15 @@ topology_template:
mgmt_net_plen:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: mgmt_net_plen
type: float
description: Management network prefix length
constraints:
@@ -27,6 +44,14 @@ topology_template:
ssc_b_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_name_0
type: string
description: Name of VM B of SSC
constraints:
@@ -34,16 +59,43 @@ topology_template:
ssc_b_untrusted_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_untrusted_ip_0
type: string
description: Fixed IPv4 address on Untrusted/access network for SSC B.
ssc_b_untrusted_parent_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_untrusted_parent_ip_0
type: string
description: Fixed IPv4 address on Untrusted/access parent network for SSC B.
perimeta_untrusted_vlan_ids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: perimeta_untrusted_vlan_ids
type: list
description: List of VLAN IDs to use on the untrusted/access network
entry_schema:
@@ -51,16 +103,41 @@ topology_template:
ssc_json_radius_servername:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_radius_servername
type: string
description: IP Address or hostname of RADIUS server
ssc_mgmt_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_mgmt_vip_0
type: string
description: Management virtual IP address to use for SSC.
rtp_msc_json_use_radius_authentication:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_use_radius_authentication
type: string
description: Json prefix, used to indicate if user account authentication is done externally through Radius
constraints:
@@ -70,16 +147,45 @@ topology_template:
ssc_trusted_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_trusted_vip_0
type: string
description: Virtual IPv4 address on Trusted/core network for SSC.
ssc_untrusted_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_untrusted_vip_0
type: string
description: Virtual IPv4 address on Untrusted/access network for SSC.
perimeta_untrusted_num_vlans:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: perimeta_untrusted_num_vlans
type: float
description: number of VLANs to connect to the untrusted/access interface
constraints:
@@ -89,6 +195,15 @@ topology_template:
rtp_msc_mgmt_vips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_mgmt_vips
type: list
description: List of management virtual IP addresses to use for RTP MSC.
entry_schema:
@@ -96,6 +211,14 @@ topology_template:
ssc_a_json_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_json_prefix
type: string
description: Json prefix, used to create the correct json file depending on the operation being performed
default: ' '
@@ -106,6 +229,14 @@ topology_template:
rtp_msc_a_untrusted_parent_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_untrusted_parent_ips
type: list
description: List of fixed IPv4 addresses on Untrusted/access parent network for RTP MSC A.
entry_schema:
@@ -113,16 +244,41 @@ topology_template:
ssc_b_trusted_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_trusted_ip_0
type: string
description: Fixed IPv4 address on Trusted/core network for SSC B.
shared_perimeta_ssc_server_group:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_perimeta_ssc_server_group
type: string
description: Server group to use for these VMs
ssc_json_radius_timeout:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_radius_timeout
type: float
description: Timeout for connect requests to RADIUS server
constraints:
@@ -132,6 +288,15 @@ topology_template:
rtp_msc_untrusted_vips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_untrusted_vips
type: list
description: List of virtual IPv4 addresses on Untrusted/access network for RTP MSC.
entry_schema:
@@ -139,11 +304,27 @@ topology_template:
rtp_msc_json_radius_servername:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_radius_servername
type: string
description: IP Address or hostname of RADIUS server
rtp_msc_vnfcnames:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_vnfcnames
type: list
description: List of vnfc names of the RTP MSC. This is the name associated with the perimeta pair and corresponds to the VIP
entry_schema:
@@ -151,6 +332,15 @@ topology_template:
ssc_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_image_name
type: string
description: Glance image to use for launching SSC Perimeta instances.
default: ISBC_SBC_v4.0.40_SU12.qcow2
@@ -159,6 +349,14 @@ topology_template:
perimeta_max_rtp_msc_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_perimeta_deployment_create
+ source_type: HEAT
+ param_name: perimeta_max_rtp_msc_count
type: float
description: Max number of RTP MSCs in a site.
default: 8
@@ -169,6 +367,17 @@ topology_template:
trusted_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: trusted_net_id
type: string
description: Network ID of Trusted/core network.
constraints: [
@@ -176,6 +385,15 @@ topology_template:
ntp_server_ip_addrs:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ntp_server_ip_addrs
type: string
description: NTP server IPv4 addresses, separated by commas. These must be accessible from the management network
constraints:
@@ -183,6 +401,14 @@ topology_template:
rtp_msc_json_radius_default:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_radius_default
type: string
description: Default authentication level for RADIUS users
constraints:
@@ -195,6 +421,14 @@ topology_template:
rtp_msc_a_vnfcnames:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_vnfcnames
type: list
description: List of vnfc names of the A of RTP MSC
entry_schema:
@@ -202,11 +436,27 @@ topology_template:
ssc_b_untrusted_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_untrusted_v6_ip_0
type: string
description: Fixed IPv6 address on Untrusted/access network for SSC B.
rtp_msc_b_index:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_index
type: float
description: Index of RTP MSC to instantiate / heal.
constraints:
@@ -216,6 +466,15 @@ topology_template:
rtp_msc_untrusted_v6_vips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_untrusted_v6_vips
type: list
description: List of virtual IPv6 addresses on Untrusted/access network for RTP MSC.
entry_schema:
@@ -223,16 +482,41 @@ topology_template:
shared_ssc_unused_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_ssc_unused_net_id
type: string
description: Unused network ID
ssc_b_rf_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: ssc_b_rf_ip_0
type: string
description: RF fixed IP address to use for SSC B.
rtp_msc_b_untrusted_parent_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_untrusted_parent_ips
type: list
description: List of fixed IPv4 addresses on Untrusted/access parent network for RTP MSC B.
entry_schema:
@@ -240,6 +524,15 @@ topology_template:
ssc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_flavor_name
type: string
description: Flavor to use for creating SSC VM instance
default: gv.c8r16d160
@@ -248,6 +541,17 @@ topology_template:
mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: mgmt_net_id
type: string
description: Management network ID
constraints: [
@@ -255,11 +559,27 @@ topology_template:
ssc_json_radius_secret:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_radius_secret
type: string
description: Shared secret to use for the RADIUS Server
rtp_msc_a_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_names
type: list
description: List of names of VM A of RTP MSC
entry_schema:
@@ -267,6 +587,17 @@ topology_template:
shared_int_ha_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_int_ha_net_id
type: string
description: HA network id
constraints: [
@@ -274,6 +605,14 @@ topology_template:
ssc_vnfcname_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_vnfcname_0
type: string
description: Name of vnfc of SSC. This is the name associated with the perimeta pair and corresponds to the VIP
constraints:
@@ -281,6 +620,15 @@ topology_template:
rtp_msc_trusted_vips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_trusted_vips
type: list
description: List of virtual IPv4 addresses on Trusted/core network for RTP MSC.
entry_schema:
@@ -288,6 +636,14 @@ topology_template:
rtp_msc_json_radius_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_radius_port
type: float
description: Port to use to connect to RADIUS server
constraints:
@@ -297,11 +653,30 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
ssc_json_radius_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_radius_port
type: float
description: Port to use to connect to RADIUS server
constraints:
@@ -311,6 +686,14 @@ topology_template:
rtp_msc_b_untrusted_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_untrusted_v6_ips
type: list
description: List of fixed IPv6 addresses on Untrusted/access network for RTP MSC B.
entry_schema:
@@ -318,6 +701,15 @@ topology_template:
rtp_msc_b_mgmt_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_b_mgmt_ips
type: list
description: List of management fixed IP addresses to use for RTP MSC B.
entry_schema:
@@ -325,21 +717,60 @@ topology_template:
ssc_a_int_ha_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_int_ha_ip_0
type: string
description: HA fixed IP address to use for SSC A.
ssc_b_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_b_mgmt_ip_0
type: string
description: Management fixed IP address to use for SSC B.
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ - base_perimeta_deployment_create
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VNF instance
rtp_msc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_flavor_name
type: string
description: Flavor to use for creating RTP MSC VM instance
default: gv.c8r16d160
@@ -348,12 +779,28 @@ topology_template:
perimeta_int_ha_net_prefix_v4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_perimeta_deployment_create
+ source_type: HEAT
+ param_name: perimeta_int_ha_net_prefix_v4
type: string
description: IPv4 subnet prefix for internal HA network
default: 172.26.1.4
rtp_msc_b_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_names
type: list
description: List of names of VM B of RTP MSC
entry_schema:
@@ -361,6 +808,14 @@ topology_template:
rtp_msc_b_untrusted_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_untrusted_ips
type: list
description: List of fixed IPv4 addresses on Untrusted/access network for RTP MSC B.
entry_schema:
@@ -368,12 +823,28 @@ topology_template:
perimeta_ssh_key:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_perimeta_deployment_create
+ source_type: HEAT
+ param_name: perimeta_ssh_key
type: string
description: SSH public key
default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXvSadEWp+nsz3gEAAAAAAAAAAbggQ3t06mqFIauHfUYMiKZ3EUX3jDFf/uGQoNsIZU6SNE/gl3tY4fFvO8Yzj8OY/vstHHvEadbY5aXNE6kd39ik20uRNbeZLT+pRllBwVKBSVnFqG3kBDvNWmBIenlPZzu3Ay0LYT/aDq6fZaz8Mqy8hzhpAAAAAAAAAAEmS/ESYY4UMs/aF2fVGmCLqudSjLpSsyD8lXag2dmeiT7cTdwRkgtDNTULXCPVucolVZwZF9BxXPNK++B+fL/ZY4MrXHXgZYGEElrMCFYkQFb3jQv3XQtxZ6gVByrzgGc9eiU7tkCgY2cVfb22iIs9n Generated-by-Nova
rtp_msc_a_index:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_index
type: float
description: Index of RTP MSC to instantiate / heal.
constraints:
@@ -383,6 +854,14 @@ topology_template:
rtp_msc_json_v41:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_v41
type: string
description: Json prefix, used to ensure that the json tags will be recognised by the server loading them
default: ' '
@@ -393,6 +872,15 @@ topology_template:
shared_perimeta_rtp_msc_server_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: shared_perimeta_rtp_msc_server_groups
type: list
description: Server group to use for these VMs
entry_schema:
@@ -400,6 +888,14 @@ topology_template:
rtp_msc_a_json_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_json_prefix
type: string
description: Json prefix, used to create the correct json file depending on the operation being performed
default: ' '
@@ -410,11 +906,28 @@ topology_template:
ssc_b_int_ha_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_b_int_ha_ip_0
type: string
description: HA fixed IP address to use for SSC B.
rtp_msc_b_vnfcnames:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_b_vnfcnames
type: list
description: List of vnfc names of VM B of RTP MSC
entry_schema:
@@ -422,26 +935,71 @@ topology_template:
ssc_a_trusted_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_trusted_ip_0
type: string
description: Fixed IPv4 address on Trusted/core network for SSC A.
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: ID of VNF
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Availability zone for A instances.
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Availability zone for B instances.
perimeta_int_ha_net_prefix_len_v4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_perimeta_deployment_create
+ source_type: HEAT
+ param_name: perimeta_int_ha_net_prefix_len_v4
type: float
description: Prefix length of subnet associated with internal HA network
default: 26
@@ -452,11 +1010,28 @@ topology_template:
ssc_a_untrusted_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_untrusted_v6_ip_0
type: string
description: Fixed IPv6 address on Untrusted/access network for SSC A.
rtp_msc_untrusted_parent_vips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_untrusted_parent_vips
type: list
description: List of virtual IPv4 addresses on Untrusted/access parent network for RTP MSC.
entry_schema:
@@ -464,6 +1039,17 @@ topology_template:
shared_int_ha_net_prefix_len_v4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_int_ha_net_prefix_len_v4
type: float
description: Prefix length of subnet associated with internal HA network
constraints:
@@ -473,11 +1059,29 @@ topology_template:
ssc_rf_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_rf_vip_0
type: string
description: RF virtual IP address to use for SSC.
rtp_msc_a_int_ha_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_int_ha_ips
type: list
description: List of HA fixed IP addresses to use for RTP MSC A.
entry_schema:
@@ -485,16 +1089,46 @@ topology_template:
shared_perimeta_keypair:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_perimeta_keypair
type: string
description: Keypair to use for accessing this Perimeta instance
shared_int_untrusted_parent_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_int_untrusted_parent_net_id
type: string
description: untrusted parent network id
ssc_a_vnfcname_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_vnfcname_0
type: string
description: vnfc name of VM A of SSC
constraints:
@@ -502,11 +1136,27 @@ topology_template:
rtp_msc_json_radius_secret:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_radius_secret
type: string
description: Shared secret to use for the RADIUS Server
rtp_msc_b_trusted_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ source_type: HEAT
+ param_name: rtp_msc_b_trusted_ips
type: list
description: List of fixed IPv4 addresses on Trusted/core network for RTP MSC B.
entry_schema:
@@ -514,6 +1164,14 @@ topology_template:
rtp_msc_a_trusted_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_trusted_ips
type: list
description: List of fixed IPv4 addresses on Trusted/core network for RTP MSC A.
entry_schema:
@@ -521,6 +1179,15 @@ topology_template:
rtp_msc_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_image_name
type: string
description: Glance image to use for launching RTP MSC Perimeta instances.
default: ISBC_SBC_v4.0.40_SU12.qcow2
@@ -529,16 +1196,42 @@ topology_template:
ssc_a_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_mgmt_ip_0
type: string
description: Management fixed IP address to use for SSC A.
ssc_untrusted_parent_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_untrusted_parent_vip_0
type: string
description: Virtual IPv4 address on Untrusted/access parent network for SSC.
rtp_msc_b_int_ha_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_b_int_ha_ips
type: list
description: List of HA fixed IP addresses to use for RTP MSC B.
entry_schema:
@@ -546,11 +1239,28 @@ topology_template:
ssc_untrusted_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_b
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_untrusted_v6_vip_0
type: string
description: Virtual IPv6 address on Untrusted/access network for SSC.
rtp_msc_a_mgmt_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_mgmt_ips
type: list
description: List of management fixed IP addresses to use for RTP MSC A.
entry_schema:
@@ -558,6 +1268,14 @@ topology_template:
rtp_msc_a_untrusted_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_untrusted_ips
type: list
description: List of fixed IPv4 addresses on Untrusted/access network for RTP MSC A.
entry_schema:
@@ -565,11 +1283,27 @@ topology_template:
ssc_a_rf_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_rf_ip_0
type: string
description: RF fixed IP address to use for SSC A.
ssc_json_use_radius_authentication:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_use_radius_authentication
type: string
description: Json prefix, used to indicate if user account authentication is done externally through Radius
constraints:
@@ -579,11 +1313,30 @@ topology_template:
ssc_a_untrusted_parent_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_untrusted_parent_ip_0
type: string
description: Fixed IPv4 address on Untrusted/access parent network for SSC A.
perimeta_untrusted_vlan_networks:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: perimeta_untrusted_vlan_networks
type: list
description: List of Contrail VLAN networks to use on the untrusted/access network. The order and number of these must match the VLAN ID list.
entry_schema:
@@ -591,11 +1344,27 @@ topology_template:
ssc_a_untrusted_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_a_untrusted_ip_0
type: string
description: Fixed IPv4 address on Untrusted/access network for SSC A.
rtp_msc_a_untrusted_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_a_untrusted_v6_ips
type: list
description: List of fixed IPv6 addresses on Untrusted/access network for RTP MSC A.
entry_schema:
@@ -603,11 +1372,28 @@ topology_template:
mgmt_net_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: mgmt_net_default_gateway
type: string
description: Default gateway for management network
rtp_msc_json_radius_timeout:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_a
+ source_type: HEAT
+ param_name: rtp_msc_json_radius_timeout
type: float
description: Timeout for connect requests to RADIUS server
constraints:
@@ -617,6 +1403,14 @@ topology_template:
ssc_b_vnfcname_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_b_vnfcname_0
type: string
description: vnfc name of VM B of SSC
constraints:
@@ -624,6 +1418,14 @@ topology_template:
ssc_json_v41:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_v41
type: string
description: Json prefix, used to ensure that the json tags will be recognised by the server loading them
default: ' '
@@ -634,6 +1436,14 @@ topology_template:
ssc_json_radius_default:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: ssc_json_radius_default
type: string
description: Default authentication level for RADIUS users
constraints:
@@ -646,6 +1456,17 @@ topology_template:
shared_perimeta_sec_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_perimeta_rtp_msc_b
+ - module_1_perimeta_ssc_b
+ - module_2_perimeta_rtp_msc_a
+ - module_1_perimeta_ssc_a
+ source_type: HEAT
+ param_name: shared_perimeta_sec_groups
type: list
description: List of security groups to add on all interfaces.
entry_schema:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml
index d61871c767..b9bc90184c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,15 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
entry_schema:
@@ -20,18 +29,45 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
oam_net_gw:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
entry_schema:
@@ -40,12 +76,30 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
cps_net_ips:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
entry_schema:
@@ -54,12 +108,30 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
pcm_volumes:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
entry_schema:
@@ -68,30 +140,75 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
cps_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
oam_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
oam_net_name:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
node_templates:
@@ -213,4 +330,4 @@ topology_template:
description: heat template that creates PCRF Cluman stack
members:
- server_pcm_004
- - server_pcm_003 \ No newline at end of file
+ - server_pcm_003
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml
index d24a02ca03..3320cc525c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,11 +14,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF_MODULE instance
vf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_name
type: string
description: The VF Name; defaults to VMVM for the virtual MVM VNF.
constraints:
@@ -28,15 +44,39 @@ topology_template:
type_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: type_name
type: string
cloud_zone_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: cloud_zone_id
type: string
description: The cloud zone for this VF instance
vf_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_instance_num
type: string
description: The number for this VF instance
constraints:
@@ -46,11 +86,27 @@ topology_template:
virtual_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: virtual_mgmt_ip_0
type: string
description: Virtual management network ip address
mvs_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mvs_mgmt_ip_0
type: list
description: List of Management network IP addresses for IPv4
entry_schema:
@@ -58,10 +114,26 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: compute_image_name
type: string
flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: flavor
type: string
description: Server flavor
constraints: [
@@ -69,6 +141,14 @@ topology_template:
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: key_name
type: string
description: SSH key name
constraints: [
@@ -76,11 +156,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: availability_zone_0
type: list
description: List of Availability Zone IDs or Names
entry_schema:
@@ -88,6 +184,14 @@ topology_template:
mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mgmt_net_id
type: string
description: Neutron UUID for the Management network
constraints: [
@@ -95,6 +199,14 @@ topology_template:
vm_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vm_instance_num
type: list
description: VM instance number list must be a list of three-digit numeric value
entry_schema:
@@ -102,11 +214,27 @@ topology_template:
bootimage:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: bootimage
type: string
description: Master bootimage volume id
sec_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: sec_groups
type: list
description: Security groups
entry_schema:
@@ -114,6 +242,14 @@ topology_template:
vf_component:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_component
type: string
description: The component that this VF instance is running
constraints:
@@ -123,6 +259,14 @@ topology_template:
num_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: num_instances
type: float
description: number of instance of the VF_module
node_templates:
@@ -542,4 +686,4 @@ topology_template:
- mvs_modules_custIndexVar2
- mvs_modules_custIndexVar1
- mvs_modules_defaultIndexVar
- - server_compute_get_attr_test \ No newline at end of file
+ - server_compute_get_attr_test
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml
index 45de38a378..bf58cb5529 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF module instance
dns_int_bearer_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_int_bearer_ips
type: list
description: DNS Bearer IP list
entry_schema:
@@ -23,16 +39,41 @@ topology_template:
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ - base_dns
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance
oam_protected_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: oam_protected_net_name
type: string
description: OAM network where instaces will connect
dns_oam_protected_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_oam_protected_ips
type: list
description: DNS OAM IP list
entry_schema:
@@ -40,48 +81,120 @@ topology_template:
dns_key:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_key
type: string
description: creator's ssh public key
int_bearer_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: int_bearer_net_name
type: string
description: Bearer network where instaces will connect
route_eth0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: route_eth0
type: string
description: OAM network routes
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availability zone ID or Name
DNS_shared_sec_grp_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: DNS_shared_sec_grp_id
type: string
description: security group UUID
node_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: node_count
type: float
description: the number of DNS nested instances
default: 4
dns_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_image_name
type: string
description: operative system image
default: NIMBUS_DNS_3.0.2.qcow2
dns_int_bearer_ipv6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_int_bearer_ipv6_ips
type: list
description: fixed IP assignment for VM's on the Bearer network
entry_schema:
@@ -89,6 +202,14 @@ topology_template:
dns_server_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_server_names
type: list
description: DNS VM server name list
entry_schema:
@@ -96,6 +217,14 @@ topology_template:
dns_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - dns_az_01
+ source_type: HEAT
+ param_name: dns_flavor_name
type: string
description: resources to by appplied on instances
default: nv.c4r4d80
@@ -219,4 +348,4 @@ topology_template:
heat_file: ../Artifacts/dns_az_01.yaml
description: DNS master template
members:
- - dns_server_group_az \ No newline at end of file
+ - dns_server_group_az
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml
index 6e7b3990c6..1fe827d91c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,11 +14,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF_MODULE instance
vf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_name
type: string
description: The VF Name; defaults to VMVM for the virtual MVM VNF.
constraints:
@@ -28,15 +44,39 @@ topology_template:
type_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: type_name
type: string
cloud_zone_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: cloud_zone_id
type: string
description: The cloud zone for this VF instance
vf_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_instance_num
type: string
description: The number for this VF instance
constraints:
@@ -46,11 +86,27 @@ topology_template:
virtual_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: virtual_mgmt_ip_0
type: string
description: Virtual management network ip address
mvs_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mvs_mgmt_ip_0
type: list
description: List of Management network IP addresses for IPv4
entry_schema:
@@ -58,10 +114,26 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: compute_image_name
type: string
flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: flavor
type: string
description: Server flavor
constraints: [
@@ -69,6 +141,14 @@ topology_template:
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: key_name
type: string
description: SSH key name
constraints: [
@@ -76,11 +156,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: availability_zone_0
type: list
description: List of Availability Zone IDs or Names
entry_schema:
@@ -88,6 +184,14 @@ topology_template:
mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mgmt_net_id
type: string
description: Neutron UUID for the Management network
constraints: [
@@ -95,6 +199,14 @@ topology_template:
vm_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vm_instance_num
type: list
description: VM instance number list must be a list of three-digit numeric value
entry_schema:
@@ -102,11 +214,27 @@ topology_template:
bootimage:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: bootimage
type: string
description: Master bootimage volume id
sec_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: sec_groups
type: list
description: Security groups
entry_schema:
@@ -114,6 +242,14 @@ topology_template:
vf_component:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_component
type: string
description: The component that this VF instance is running
constraints:
@@ -123,6 +259,14 @@ topology_template:
num_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: num_instances
type: float
description: number of instance of the VF_module
node_templates:
@@ -196,4 +340,4 @@ topology_template:
Metaswitch MVS (Metaview Server)
members:
- mvs_modules
- - server_compute_get_attr_test \ No newline at end of file
+ - server_compute_get_attr_test
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/MainServiceTemplate.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/MainServiceTemplate.yaml
index ee856f8b00..94da460a6e 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/MainServiceTemplate.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/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF_MODULE instance
vf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_name
type: string
description: The VF Name; defaults to VMVM for the virtual MVM VNF.
constraints:
@@ -25,11 +41,27 @@ topology_template:
cloud_zone_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: cloud_zone_id
type: string
description: The cloud zone for this VF instance
vf_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_instance_num
type: string
description: The number for this VF instance
constraints:
@@ -39,11 +71,27 @@ topology_template:
virtual_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: virtual_mgmt_ip_0
type: string
description: Virtual management network ip address
mvs_mgmt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mvs_mgmt_ip_0
type: list
description: List of Management network IP addresses for IPv4
entry_schema:
@@ -51,6 +99,14 @@ topology_template:
flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: flavor
type: string
description: Server flavor
constraints: [
@@ -58,6 +114,14 @@ topology_template:
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: key_name
type: string
description: SSH key name
constraints: [
@@ -65,11 +129,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: availability_zone_0
type: list
description: List of Availability Zone IDs or Names
entry_schema:
@@ -77,6 +157,14 @@ topology_template:
mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: mgmt_net_id
type: string
description: Neutron UUID for the Management network
constraints: [
@@ -84,6 +172,14 @@ topology_template:
vm_instance_num:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vm_instance_num
type: list
description: VM instance number list must be a list of three-digit numeric value
entry_schema:
@@ -91,11 +187,27 @@ topology_template:
bootimage:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: bootimage
type: string
description: Master bootimage volume id
sec_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: sec_groups
type: list
description: Security groups
entry_schema:
@@ -103,6 +215,14 @@ topology_template:
vf_component:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: vf_component
type: string
description: The component that this VF instance is running
constraints:
@@ -112,6 +232,14 @@ topology_template:
num_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - mvs.vfmodule.heat
+ source_type: HEAT
+ param_name: num_instances
type: float
description: number of instance of the VF_module
node_templates:
@@ -168,4 +296,4 @@ topology_template:
description: |
Metaswitch MVS (Metaview Server)
members:
- - mvs_modules \ No newline at end of file
+ - mvs_modules
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml
index 90dcdb5d5f..7d86e3774a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,15 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
entry_schema:
@@ -20,18 +29,45 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
oam_net_gw:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
entry_schema:
@@ -40,12 +76,30 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
cps_net_ips:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
entry_schema:
@@ -54,12 +108,30 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
pcm_volumes:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
entry_schema:
@@ -68,30 +140,75 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
cps_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
oam_net_mask:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
oam_net_name:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4_2
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
node_templates:
@@ -219,4 +336,4 @@ topology_template:
value:
get_attribute:
- server_pcm_002
- - oam_net_ip \ No newline at end of file
+ - oam_net_ip
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml
index aba8c1aa81..973d8c0409 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml
@@ -15,6 +15,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -25,6 +33,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -32,6 +48,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -39,6 +63,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -49,6 +81,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -56,6 +96,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -66,6 +114,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -73,6 +129,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -82,22 +146,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -105,6 +201,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -112,6 +216,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -119,6 +231,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..ac73bf2b00
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml
@@ -0,0 +1,1112 @@
+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.pd_server:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+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:
+ - heat3
+ - heat1
+ - heat2
+ 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:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: availabilityzone_name
+ type: string
+ description: availabilityzone name
+ default: nova
+ repl_net_ips:
+ label: repl network ips
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: repl_net_ips
+ type: list
+ description: ips of repl network
+ default:
+ - 107.239.33.57
+ - 107.239.33.58
+ entry_schema:
+ type: string
+ sl_net_name:
+ label: silver lining network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: sl_net_name
+ type: string
+ description: id of the sl network
+ default: exn_protected_net_0
+ pd_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ 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:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: pd_server_names
+ type: list
+ description: name of the PD instance
+ default:
+ - ZRDM1MOGX01MPD001
+ - ZRDM1MOGX01MPD002
+ entry_schema:
+ type: string
+ sm_server_names:
+ label: SM server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat1
+ source_type: HEAT
+ param_name: sm_server_names
+ type: list
+ description: name of the SM instance
+ default:
+ - ZRDM1MOGX01MSM001
+ - ZRDM1MOGX01MSM002
+ entry_schema:
+ type: string
+ dummy_net_netmask_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_netmask_1
+ type: string
+ description: CSB internal network subnet mask
+ default: 255.255.255.0
+ dummy_net_netmask_0:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_netmask_0
+ type: string
+ description: CSB internal network subnet mask
+ default: 255.255.255.0
+ ran_net_floating_ip:
+ label: mog ran net virtual ip
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ran_net_floating_ip
+ type: string
+ description: mog ran net virtual ip
+ default: 107.239.36.5
+ ran_net_ips:
+ label: RAN network ips
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ran_net_ips
+ type: list
+ description: RAN network ip
+ default:
+ - 107.239.36.3
+ - 107.239.36.4
+ entry_schema:
+ type: string
+ dummy_net_end_0:
+ label: csb internal end
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_end_0
+ type: string
+ description: csb internal end
+ default: 169.254.1.254
+ oam_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam_image_name
+ type: string
+ description: OAM image name
+ default: MOG_BASE_8.0
+ dummy_net_end_1:
+ label: csb internal end
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_end_1
+ type: string
+ description: csb internal end
+ default: 169.254.2.254
+ oam_net_name:
+ label: oam network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam_net_name
+ type: string
+ description: name of the oam network
+ default: oam_protected_net_0
+ oam_net_ips:
+ label: internet network ips
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam_net_ips
+ type: list
+ description: ip of the OAM network
+ default:
+ - 107.250.172.213
+ - 107.250.172.214
+ - 107.250.172.215
+ - 107.250.172.216
+ - 107.250.172.217
+ entry_schema:
+ type: string
+ ran_net_name:
+ label: RAN network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ran_net_name
+ type: string
+ description: RAN network name
+ default: gn_direct_net_0
+ cluster-manager-vol-1:
+ label: mog-cm-vol-1
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
+ type: string
+ description: Cluster Manager volume 1
+ default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
+ csb_net_netmask:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_netmask
+ type: string
+ description: CSB internal network subnet mask
+ default: 255.255.255.0
+ oam_flavor_name:
+ label: OAM flavor name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam_flavor_name
+ type: string
+ description: flavor name of OAM instance
+ default: m3.xlarge
+ dummy_net_start_0:
+ label: csb internal start
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_start_0
+ type: string
+ description: csb internal start
+ default: 169.254.1.4
+ dummy_net_start_1:
+ label: csb internal start
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_start_1
+ type: string
+ description: csb internal start
+ default: 169.254.2.4
+ cm_flavor_name:
+ label: CM flavor name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: cm_flavor_name
+ type: string
+ description: flavor name of CM instance
+ default: m3.xlarge
+ sm_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: sm_image_name
+ type: string
+ description: SM image name
+ default: MOG_BASE_8.0
+ ps_server_names:
+ label: PS server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ps_server_names
+ type: list
+ description: name of the PS instance
+ default:
+ - ZRDM1MOGX01MPS001
+ - ZRDM1MOGX01MPS002
+ - ZRDM1MOGX01MPS003
+ - ZRDM1MOGX01MPS004
+ entry_schema:
+ type: string
+ csb_net_ips:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_ips
+ type: list
+ description: mog_csb_net IP addresses
+ default:
+ - 172.26.0.10
+ - 172.26.0.11
+ - 172.26.0.12
+ - 172.26.0.13
+ - 172.26.0.14
+ - 172.26.0.15
+ - 172.26.0.16
+ - 172.26.0.17
+ - 172.26.0.18
+ - 172.26.0.19
+ - 172.26.0.20
+ entry_schema:
+ type: string
+ ps_flavor_name:
+ label: PS flavor name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ps_flavor_name
+ type: string
+ description: flavor name of PS instance
+ default: m3.xlarge
+ rx_net_ips:
+ label: Rx network ips
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: rx_net_ips
+ type: list
+ description: Rx network ips
+ default:
+ - 107.239.34.3
+ - 107.239.34.4
+ entry_schema:
+ type: string
+ dummy_net_name_1:
+ label: csb internal network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_name_1
+ type: string
+ description: csb internal network name
+ default: mog_dummy_1
+ dummy_net_cidr_1:
+ label: csb ineternal cidr
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ source_type: HEAT
+ param_name: dummy_net_cidr_1
+ type: string
+ description: csb internal cidr
+ default: 169.254.2.0/24
+ dummy_net_name_0:
+ label: csb internal network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: dummy_net_name_0
+ type: string
+ description: csb internal network name
+ default: mog_dummy_0
+ dummy_net_cidr_0:
+ label: csb ineternal cidr
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ source_type: HEAT
+ param_name: dummy_net_cidr_0
+ type: string
+ description: csb internal cidr
+ default: 169.254.1.0/24
+ oam-vol-2:
+ label: mog-oam-vol-2
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam-vol-2
+ type: string
+ description: OAM volume 2
+ default: 6d169cb6-6ddc-41dc-920c-2839898a2924
+ sl_net_floating_ip:
+ label: mog sl net virtual ip
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: sl_net_floating_ip
+ type: string
+ description: mog sl net virtual ip
+ default: 107.239.45.6
+ session-manager-vol-1:
+ label: mog-sm-vol-1
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: session-manager-vol-1
+ type: string
+ description: Session Manager volume 1
+ default: 49201898-333d-4c88-b58d-cf573b091633
+ rx_net_floating_ip:
+ label: mog rx net virtual ip
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: rx_net_floating_ip
+ type: string
+ description: mog rx net virtual ip
+ default: 107.239.34.5
+ session-manager-vol-2:
+ label: mog-sm-vol-2
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: session-manager-vol-2
+ type: string
+ description: Session Manager volume 2
+ default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
+ oam-vol-1:
+ label: mog-oam-vol-1
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam-vol-1
+ type: string
+ description: OAM volume 1
+ default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
+ csb_net_start:
+ label: csb internal start
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_start
+ type: string
+ description: csb internal start
+ default: 172.26.0.1
+ cm_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: cm_image_name
+ type: string
+ description: CM image name
+ default: MOG_BASE_8.0
+ sm_flavor_name:
+ label: SM flavor name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: sm_flavor_name
+ type: string
+ description: flavor name of SM instance
+ default: m2.xlarge4
+ ps_image_name:
+ label: PS image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: ps_image_name
+ type: string
+ description: PS image name
+ default: MOG_BASE_8.0
+ oam_server_names:
+ label: OAM server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: oam_server_names
+ type: list
+ description: name of the OAM instance
+ default:
+ - ZRDM1MOGX01OAM001
+ - ZRDM1MOGX01OAM002
+ entry_schema:
+ type: string
+ csb_net_cidr:
+ label: csb ineternal cidr
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_cidr
+ type: string
+ description: csb internal cidr
+ default: 172.26.0.0/24
+ cm_server_names:
+ label: CM server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: cm_server_names
+ type: list
+ description: name of the CM instance
+ default:
+ - ZRDM1MOGX01MCM001
+ entry_schema:
+ type: string
+ sl_net_ips:
+ label: silver lining network ips
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: sl_net_ips
+ type: list
+ description: ips of the sl network
+ default:
+ - 107.239.45.4
+ - 107.239.45.5
+ entry_schema:
+ type: string
+ rx_net_name:
+ label: Rx network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: rx_net_name
+ type: string
+ description: Rx network name
+ default: cor_direct_net_1
+ repl_net_name:
+ label: Replication network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: repl_net_name
+ type: string
+ description: name of the replication network
+ default: cor_direct_net_0
+ security_group_name:
+ label: security group name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: security_group_name
+ type: string
+ description: the name of security group
+ default: mog_security_group
+ csb_net_end:
+ label: csb internal end
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_end
+ type: string
+ description: csb internal end
+ default: 172.26.0.254
+ csb_net_name:
+ label: csb internal network name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - heat3
+ - heat1
+ - heat2
+ source_type: HEAT
+ param_name: csb_net_name
+ type: string
+ description: csb internal network name
+ default: int_mog_csb_net
+ node_templates:
+ pd01_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_01
+ relationship: tosca.relationships.network.BindsTo
+ pd03_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_02
+ relationship: tosca.relationships.network.BindsTo
+ pd02_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_01
+ relationship: tosca.relationships.network.BindsTo
+ server_pd_02:
+ type: org.openecomp.resource.vfc.nodes.heat.pd_server
+ properties:
+ flavor:
+ get_input: pd_flavor_name
+ availability_zone:
+ get_input: availabilityzone_name
+ image:
+ get_input: pd_image_name
+ user_data_format: RAW
+ name:
+ get_input:
+ - pd_server_names
+ - 0
+ pd04_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_02
+ relationship: tosca.relationships.network.BindsTo
+ server_pd_01:
+ type: org.openecomp.resource.vfc.nodes.heat.pd_server
+ properties:
+ flavor:
+ get_input: pd_flavor_name
+ availability_zone:
+ get_input: availabilityzone_name
+ image:
+ get_input: pd_image_name
+ user_data_format: RAW
+ name:
+ get_input:
+ - pd_server_names
+ - 0
+ server_pd_03:
+ type: org.openecomp.resource.vfc.nodes.heat.pd_server
+ properties:
+ flavor:
+ get_input: pd_flavor_name
+ availability_zone:
+ get_input: availabilityzone_name
+ image:
+ get_input: pd_image_name
+ user_data_format: RAW
+ name:
+ get_input:
+ - pd_server_names
+ - 0
+ pd01_port_5:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_03
+ relationship: tosca.relationships.network.BindsTo
+ pd02_port_6:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pd_03
+ relationship: tosca.relationships.network.BindsTo
+ groups:
+ heat3_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/heat3.yml
+ description: heat template that creates MOG stack
+ members:
+ - server_pd_03
+ - pd01_port_5
+ - pd02_port_6
+ heat1_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/heat1.yml
+ description: heat template that creates MOG stack
+ members:
+ - pd01_port_0
+ - pd02_port_0
+ - server_pd_01
+ heat2_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/heat2.yml
+ description: heat template that creates MOG stack
+ members:
+ - pd03_port_0
+ - server_pd_02
+ - pd04_port_0 \ 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/parameters/allHeatsAreBase/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json
new file mode 100644
index 0000000000..1e34f17ee1
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/MANIFEST.json
@@ -0,0 +1,38 @@
+{
+ "name": "heat",
+ "description": "HOT template to create hot mog server",
+ "version": "2013-05-23",
+ "data": [
+ {
+ "file": "heat1.yml",
+ "type": "HEAT",
+ "data": [
+ {
+ "file": "heat1.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ },
+ {
+ "file": "heat2.yml",
+ "type": "HEAT",
+ "isBase": "true",
+ "data": [
+ {
+ "file": "heat2.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ },
+ {
+ "file": "heat3.yml",
+ "type": "HEAT",
+ "data": [
+ {
+ "file": "heat3.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ }
+ ]
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env
new file mode 100644
index 0000000000..137187c9fe
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.env
@@ -0,0 +1,51 @@
+parameters:
+ pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002
+ pd_image_name: MOG_BASE_8.0
+ pd_flavor_name: m3.xlarge
+ oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002
+ oam_image_name: MOG_BASE_8.0
+ oam_flavor_name: m3.xlarge
+ sm_server_names: ZRDM1MOGX01MSM001,ZRDM1MOGX01MSM002
+ sm_image_name: MOG_BASE_8.0
+ sm_flavor_name: m2.xlarge4
+ ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004
+ ps_image_name: MOG_BASE_8.0
+ ps_flavor_name: m3.xlarge
+ cm_server_names: ZRDM1MOGX01MCM001
+ cm_image_name: MOG_BASE_8.0
+ cm_flavor_name: m3.xlarge
+ availabilityzone_name: nova
+ oam_net_name: oam_protected_net_0
+ oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217
+ #internet_net_name: dmz_protected_net_0
+ #internet_net_ips: 107.239.53.4,107.239.53.5
+ # internet_net_floating_ip: 107.239.53.6
+ sl_net_name: exn_protected_net_0
+ sl_net_ips: 107.239.45.4,107.239.45.5
+ sl_net_floating_ip: 107.239.45.6
+ repl_net_name: cor_direct_net_0
+ repl_net_ips: 107.239.33.57,107.239.33.58
+ rx_net_name: cor_direct_net_1
+ rx_net_ips: 107.239.34.3,107.239.34.4
+ rx_net_floating_ip: 107.239.34.5
+ ran_net_name: gn_direct_net_0
+ ran_net_ips: 107.239.36.3,107.239.36.4
+ ran_net_floating_ip: 107.239.36.5
+ dummy_net_name_0: mog_dummy_0
+ dummy_net_start_0: 169.254.1.4
+ dummy_net_end_0: 169.254.1.254
+ dummy_net_netmask_0: 255.255.255.0
+ dummy_net_name_1: mog_dummy_1
+ dummy_net_end_1: 169.254.2.254
+ dummy_net_cidr_1: 169.254.2.0/24
+ csb_net_name: int_mog_csb_net
+ csb_net_start: 172.26.0.1
+ csb_net_end: 172.26.0.254
+ csb_net_cidr: 172.26.0.0/24
+ csb_net_netmask: 255.255.255.0
+ security_group_name: mog_security_group
+ cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
+ session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633
+ session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
+ oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
+ oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924 \ 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/parameters/allHeatsAreBase/inputs/heat1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml
new file mode 100644
index 0000000000..21a58546bb
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat1.yml
@@ -0,0 +1,216 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates MOG stack
+
+parameters:
+ pd_server_names:
+ type: comma_delimited_list
+ label: PD server names
+ description: name of the PD instance
+ pd_image_name:
+ type: string
+ label: image name
+ description: PD image name
+ pd_flavor_name:
+ type: string
+ label: PD flavor name
+ description: flavor name of PD instance
+ oam_server_names:
+ type: comma_delimited_list
+ label: OAM server names
+ description: name of the OAM instance
+ oam_image_name:
+ type: string
+ label: image name
+ description: OAM image name
+ oam_flavor_name:
+ type: string
+ label: OAM flavor name
+ description: flavor name of OAM instance
+ sm_server_names:
+ type: comma_delimited_list
+ label: SM server names
+ description: name of the SM instance
+ sm_image_name:
+ type: string
+ label: image name
+ description: SM image name
+ sm_flavor_name:
+ type: string
+ label: SM flavor name
+ description: flavor name of SM instance
+ ps_server_names:
+ type: comma_delimited_list
+ label: PS server names
+ description: name of the PS instance
+ ps_image_name:
+ type: string
+ label: PS image name
+ description: PS image name
+ ps_flavor_name:
+ type: string
+ label: PS flavor name
+ description: flavor name of PS instance
+ cm_server_names:
+ type: comma_delimited_list
+ label: CM server names
+ description: name of the CM instance
+ cm_image_name:
+ type: string
+ label: image name
+ description: CM image name
+ cm_flavor_name:
+ type: string
+ label: CM flavor name
+ description: flavor name of CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_name:
+ type: string
+ label: oam network name
+ description: name of the oam network
+ oam_net_ips:
+ type: comma_delimited_list
+ label: internet network ips
+ description: ip of the OAM network
+ sl_net_name:
+ type: string
+ label: silver lining network name
+ description: id of the sl network
+ sl_net_ips:
+ type: comma_delimited_list
+ label: silver lining network ips
+ description: ips of the sl network
+ sl_net_floating_ip:
+ type: string
+ label: mog sl net virtual ip
+ description: mog sl net virtual ip
+ repl_net_name:
+ type: string
+ label: Replication network name
+ description: name of the replication network
+ repl_net_ips:
+ type: comma_delimited_list
+ label: repl network ips
+ description: ips of repl network
+ rx_net_name:
+ type: string
+ label: Rx network name
+ description: Rx network name
+ rx_net_ips:
+ type: comma_delimited_list
+ label: Rx network ips
+ description: Rx network ips
+ rx_net_floating_ip:
+ type: string
+ label: mog rx net virtual ip
+ description: mog rx net virtual ip
+ ran_net_name:
+ type: string
+ label: RAN network name
+ description: RAN network name
+ ran_net_ips:
+ type: comma_delimited_list
+ label: RAN network ips
+ description: RAN network ip
+ ran_net_floating_ip:
+ type: string
+ label: mog ran net virtual ip
+ description: mog ran net virtual ip
+ csb_net_name:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ csb_net_start:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ csb_net_end:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ csb_net_cidr:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+ csb_net_netmask:
+ type: string
+ description: CSB internal network subnet mask
+ dummy_net_name_0:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_start_0:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ dummy_net_cidr_1:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+ dummy_net_end_0:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ dummy_net_netmask_0:
+ type: string
+ description: CSB internal network subnet mask
+ dummy_net_name_1:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_end_1:
+ type: string
+ label: csb internal end
+ description: csb internal end
+
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ cluster-manager-vol-1:
+ type: string
+ label: mog-cm-vol-1
+ description: Cluster Manager volume 1
+ session-manager-vol-1:
+ type: string
+ label: mog-sm-vol-1
+ description: Session Manager volume 1
+ session-manager-vol-2:
+ type: string
+ label: mog-sm-vol-2
+ description: Session Manager volume 2
+ oam-vol-1:
+ type: string
+ label: mog-oam-vol-1
+ description: OAM volume 1
+ oam-vol-2:
+ type: string
+ label: mog-oam-vol-2
+ description: OAM volume 2
+
+resources:
+ server_pd_01:
+ type: OS::Nova::Server
+ properties:
+# config_drive: "True"
+ name: {get_param: [pd_server_names, 0]}
+ image: {get_param: pd_image_name}
+ flavor: {get_param: pd_flavor_name}
+ availability_zone: {get_param: availabilityzone_name}
+ networks:
+ - port: {get_resource: pd01_port_0}
+ - port: {get_resource: pd02_port_0}
+ user_data_format: RAW
+
+ pd01_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+ pd02_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env
new file mode 100644
index 0000000000..a4d3c83379
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.env
@@ -0,0 +1,52 @@
+parameters:
+ pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002
+ pd_image_name: MOG_BASE_8.0
+ pd_flavor_name: m3.xlarge
+ oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002
+ oam_image_name: MOG_BASE_8.0
+ oam_flavor_name: m3.xlarge
+ sm_image_name: MOG_BASE_8.0
+ sm_flavor_name: m2.xlarge4
+ ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004
+ ps_image_name: MOG_BASE_8.0
+ ps_flavor_name: m3.xlarge
+ cm_server_names: ZRDM1MOGX01MCM001
+ cm_image_name: MOG_BASE_8.0
+ cm_flavor_name: m3.xlarge
+ availabilityzone_name: nova
+ oam_net_name: oam_protected_net_0
+ oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217
+ #internet_net_name: dmz_protected_net_0
+ #internet_net_ips: 107.239.53.4,107.239.53.5
+ # internet_net_floating_ip: 107.239.53.6
+ sl_net_name: exn_protected_net_0
+ sl_net_ips: 107.239.45.4,107.239.45.5
+ sl_net_floating_ip: 107.239.45.6
+ repl_net_name: cor_direct_net_0
+ repl_net_ips: 107.239.33.57,107.239.33.58
+ rx_net_name: cor_direct_net_1
+ rx_net_ips: 107.239.34.3,107.239.34.4
+ rx_net_floating_ip: 107.239.34.5
+ ran_net_name: gn_direct_net_0
+ ran_net_ips: 107.239.36.3,107.239.36.4
+ ran_net_floating_ip: 107.239.36.5
+ dummy_net_name_0: mog_dummy_0
+ dummy_net_start_0: 169.254.1.4
+ dummy_net_end_0: 169.254.1.254
+ dummy_net_netmask_0: 255.255.255.0
+ dummy_net_name_1: mog_dummy_1
+ dummy_net_start_1: 169.254.2.4
+ dummy_net_end_1: 169.254.2.254
+ dummy_net_netmask_1: 255.255.255.0
+ csb_net_name: int_mog_csb_net
+ csb_net_ips: 172.26.0.10,172.26.0.11,172.26.0.12,172.26.0.13,172.26.0.14,172.26.0.15,172.26.0.16,172.26.0.17,172.26.0.18,172.26.0.19,172.26.0.20
+ csb_net_start: 172.26.0.1
+ csb_net_end: 172.26.0.254
+ csb_net_cidr: 172.26.0.0/24
+ csb_net_netmask: 255.255.255.0
+ security_group_name: mog_security_group
+ cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
+ session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633
+ session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
+ oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
+ oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924 \ 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/parameters/allHeatsAreBase/inputs/heat2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml
new file mode 100644
index 0000000000..92354127b2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat2.yml
@@ -0,0 +1,218 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates MOG stack
+
+parameters:
+ pd_server_names:
+ type: comma_delimited_list
+ label: PD server names
+ description: name of the PD instance
+ pd_image_name:
+ type: string
+ label: image name
+ description: PD image name
+ pd_flavor_name:
+ type: string
+ label: PD flavor name
+ description: flavor name of PD instance
+ oam_server_names:
+ type: comma_delimited_list
+ label: OAM server names
+ description: name of the OAM instance
+ oam_image_name:
+ type: string
+ label: image name
+ description: OAM image name
+ oam_flavor_name:
+ type: string
+ label: OAM flavor name
+ description: flavor name of OAM instance
+ sm_image_name:
+ type: string
+ label: image name
+ description: SM image name
+ sm_flavor_name:
+ type: string
+ label: SM flavor name
+ description: flavor name of SM instance
+ ps_server_names:
+ type: comma_delimited_list
+ label: PS server names
+ description: name of the PS instance
+ ps_image_name:
+ type: string
+ label: PS image name
+ description: PS image name
+ ps_flavor_name:
+ type: string
+ label: PS flavor name
+ description: flavor name of PS instance
+ cm_server_names:
+ type: comma_delimited_list
+ label: CM server names
+ description: name of the CM instance
+ cm_image_name:
+ type: string
+ label: image name
+ description: CM image name
+ cm_flavor_name:
+ type: string
+ label: CM flavor name
+ description: flavor name of CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_name:
+ type: string
+ label: oam network name
+ description: name of the oam network
+ oam_net_ips:
+ type: comma_delimited_list
+ label: internet network ips
+ description: ip of the OAM network
+ sl_net_name:
+ type: string
+ label: silver lining network name
+ description: id of the sl network
+ sl_net_ips:
+ type: comma_delimited_list
+ label: silver lining network ips
+ description: ips of the sl network
+ sl_net_floating_ip:
+ type: string
+ label: mog sl net virtual ip
+ description: mog sl net virtual ip
+ repl_net_name:
+ type: string
+ label: Replication network name
+ description: name of the replication network
+ repl_net_ips:
+ type: comma_delimited_list
+ label: repl network ips
+ description: ips of repl network
+ rx_net_name:
+ type: string
+ label: Rx network name
+ description: Rx network name
+ rx_net_ips:
+ type: comma_delimited_list
+ label: Rx network ips
+ description: Rx network ips
+ rx_net_floating_ip:
+ type: string
+ label: mog rx net virtual ip
+ description: mog rx net virtual ip
+ ran_net_name:
+ type: string
+ label: RAN network name
+ description: RAN network name
+ ran_net_ips:
+ type: comma_delimited_list
+ label: RAN network ips
+ description: RAN network ip
+ ran_net_floating_ip:
+ type: string
+ label: mog ran net virtual ip
+ description: mog ran net virtual ip
+ csb_net_name:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ csb_net_start:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ csb_net_end:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ csb_net_cidr:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+ csb_net_netmask:
+ type: string
+ description: CSB internal network subnet mask
+ csb_net_ips:
+ type: comma_delimited_list
+ description: mog_csb_net IP addresses
+ dummy_net_name_0:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_start_0:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ dummy_net_end_0:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ dummy_net_netmask_0:
+ type: string
+ description: CSB internal network subnet mask
+ dummy_net_name_1:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_start_1:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ dummy_net_end_1:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ dummy_net_netmask_1:
+ type: string
+ description: CSB internal network subnet mask
+
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ cluster-manager-vol-1:
+ type: string
+ label: mog-cm-vol-1
+ description: Cluster Manager volume 1
+ session-manager-vol-1:
+ type: string
+ label: mog-sm-vol-1
+ description: Session Manager volume 1
+ session-manager-vol-2:
+ type: string
+ label: mog-sm-vol-2
+ description: Session Manager volume 2
+ oam-vol-1:
+ type: string
+ label: mog-oam-vol-1
+ description: OAM volume 1
+ oam-vol-2:
+ type: string
+ label: mog-oam-vol-2
+ description: OAM volume 2
+
+resources:
+ server_pd_02:
+ type: OS::Nova::Server
+ properties:
+# config_drive: "True"
+ name: {get_param: [pd_server_names, 0]}
+ image: {get_param: pd_image_name}
+ flavor: {get_param: pd_flavor_name}
+ availability_zone: {get_param: availabilityzone_name}
+ networks:
+ - port: {get_resource: pd03_port_0}
+ - port: {get_resource: pd04_port_0}
+ user_data_format: RAW
+
+ pd03_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+ pd04_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env
new file mode 100644
index 0000000000..5508e986fe
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.env
@@ -0,0 +1,52 @@
+parameters:
+ pd_server_names: ZRDM1MOGX01MPD001,ZRDM1MOGX01MPD002
+ pd_image_name: MOG_BASE_8.0
+ pd_flavor_name: m3.xlarge
+ oam_server_names: ZRDM1MOGX01OAM001,ZRDM1MOGX01OAM002
+ oam_image_name: MOG_BASE_8.0
+ oam_flavor_name: m3.xlarge
+ sm_image_name: MOG_BASE_8.0
+ sm_flavor_name: m2.xlarge4
+ ps_server_names: ZRDM1MOGX01MPS001,ZRDM1MOGX01MPS002,ZRDM1MOGX01MPS003,ZRDM1MOGX01MPS004
+ ps_image_name: MOG_BASE_8.0
+ cm_server_names: ZRDM1MOGX01MCM001
+ cm_image_name: MOG_BASE_8.0
+ cm_flavor_name: m3.xlarge
+ availabilityzone_name: nova
+ oam_net_name: oam_protected_net_0
+ oam_net_ips: 107.250.172.213,107.250.172.214,107.250.172.215,107.250.172.216,107.250.172.217
+ #internet_net_name: dmz_protected_net_0
+ #internet_net_ips: 107.239.53.4,107.239.53.5
+ # internet_net_floating_ip: 107.239.53.6
+ sl_net_name: exn_protected_net_0
+ sl_net_ips: 107.239.45.4,107.239.45.5
+ sl_net_floating_ip: 107.239.45.6
+ repl_net_name: cor_direct_net_0
+ repl_net_ips: 107.239.33.57,107.239.33.58
+ rx_net_name: cor_direct_net_1
+ rx_net_ips: 107.239.34.3,107.239.34.4
+ rx_net_floating_ip: 107.239.34.5
+ ran_net_name: gn_direct_net_0
+ ran_net_ips: 107.239.36.3,107.239.36.4
+ ran_net_floating_ip: 107.239.36.5
+ dummy_net_name_0: mog_dummy_0
+ dummy_net_start_0: 169.254.1.4
+ dummy_net_end_0: 169.254.1.254
+ dummy_net_cidr_0: 169.254.1.0/24
+ dummy_net_netmask_0: 255.255.255.0
+ dummy_net_name_1: mog_dummy_1
+ dummy_net_start_1: 169.254.2.4
+ dummy_net_end_1: 169.254.2.254
+ dummy_net_cidr_1: 169.254.2.0/24
+ csb_net_name: int_mog_csb_net
+ csb_net_ips: 172.26.0.10,172.26.0.11,172.26.0.12,172.26.0.13,172.26.0.14,172.26.0.15,172.26.0.16,172.26.0.17,172.26.0.18,172.26.0.19,172.26.0.20
+ csb_net_start: 172.26.0.1
+ csb_net_end: 172.26.0.254
+ csb_net_cidr: 172.26.0.0/24
+ csb_net_netmask: 255.255.255.0
+ security_group_name: mog_security_group
+ cluster-manager-vol-1: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
+ session-manager-vol-1: 49201898-333d-4c88-b58d-cf573b091633
+ session-manager-vol-2: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
+ oam-vol-1: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
+ oam-vol-2: 6d169cb6-6ddc-41dc-920c-2839898a2924 \ 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/parameters/allHeatsAreBase/inputs/heat3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml
new file mode 100644
index 0000000000..4f5d690b94
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/inputs/heat3.yml
@@ -0,0 +1,219 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates MOG stack
+
+parameters:
+ pd_server_names:
+ type: comma_delimited_list
+ label: PD server names
+ description: name of the PD instance
+ pd_image_name:
+ type: string
+ label: image name
+ description: PD image name
+ pd_flavor_name:
+ type: string
+ label: PD flavor name
+ description: flavor name of PD instance
+ oam_server_names:
+ type: comma_delimited_list
+ label: OAM server names
+ description: name of the OAM instance
+ oam_image_name:
+ type: string
+ label: image name
+ description: OAM image name
+ oam_flavor_name:
+ type: string
+ label: OAM flavor name
+ description: flavor name of OAM instance
+ sm_image_name:
+ type: string
+ label: image name
+ description: SM image name
+ sm_flavor_name:
+ type: string
+ label: SM flavor name
+ description: flavor name of SM instance
+ ps_server_names:
+ type: comma_delimited_list
+ label: PS server names
+ description: name of the PS instance
+ ps_image_name:
+ type: string
+ label: PS image name
+ description: PS image name
+ cm_server_names:
+ type: comma_delimited_list
+ label: CM server names
+ description: name of the CM instance
+ cm_image_name:
+ type: string
+ label: image name
+ description: CM image name
+ cm_flavor_name:
+ type: string
+ label: CM flavor name
+ description: flavor name of CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_name:
+ type: string
+ label: oam network name
+ description: name of the oam network
+ oam_net_ips:
+ type: comma_delimited_list
+ label: internet network ips
+ description: ip of the OAM network
+ sl_net_name:
+ type: string
+ label: silver lining network name
+ description: id of the sl network
+ sl_net_ips:
+ type: comma_delimited_list
+ label: silver lining network ips
+ description: ips of the sl network
+ sl_net_floating_ip:
+ type: string
+ label: mog sl net virtual ip
+ description: mog sl net virtual ip
+ repl_net_name:
+ type: string
+ label: Replication network name
+ description: name of the replication network
+ repl_net_ips:
+ type: comma_delimited_list
+ label: repl network ips
+ description: ips of repl network
+ rx_net_name:
+ type: string
+ label: Rx network name
+ description: Rx network name
+ rx_net_ips:
+ type: comma_delimited_list
+ label: Rx network ips
+ description: Rx network ips
+ rx_net_floating_ip:
+ type: string
+ label: mog rx net virtual ip
+ description: mog rx net virtual ip
+ ran_net_name:
+ type: string
+ label: RAN network name
+ description: RAN network name
+ ran_net_ips:
+ type: comma_delimited_list
+ label: RAN network ips
+ description: RAN network ip
+ ran_net_floating_ip:
+ type: string
+ label: mog ran net virtual ip
+ description: mog ran net virtual ip
+ csb_net_name:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ csb_net_start:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ csb_net_end:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ csb_net_cidr:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+ csb_net_netmask:
+ type: string
+ description: CSB internal network subnet mask
+ csb_net_ips:
+ type: comma_delimited_list
+ description: mog_csb_net IP addresses
+ dummy_net_name_0:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_start_0:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ dummy_net_end_0:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ dummy_net_cidr_0:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+ dummy_net_netmask_0:
+ type: string
+ description: CSB internal network subnet mask
+ dummy_net_name_1:
+ type: string
+ label: csb internal network name
+ description: csb internal network name
+ dummy_net_start_1:
+ type: string
+ label: csb internal start
+ description: csb internal start
+ dummy_net_end_1:
+ type: string
+ label: csb internal end
+ description: csb internal end
+ dummy_net_cidr_1:
+ type: string
+ label: csb ineternal cidr
+ description: csb internal cidr
+
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ cluster-manager-vol-1:
+ type: string
+ label: mog-cm-vol-1
+ description: Cluster Manager volume 1
+ session-manager-vol-1:
+ type: string
+ label: mog-sm-vol-1
+ description: Session Manager volume 1
+ session-manager-vol-2:
+ type: string
+ label: mog-sm-vol-2
+ description: Session Manager volume 2
+ oam-vol-1:
+ type: string
+ label: mog-oam-vol-1
+ description: OAM volume 1
+ oam-vol-2:
+ type: string
+ label: mog-oam-vol-2
+ description: OAM volume 2
+
+resources:
+ server_pd_03:
+ type: OS::Nova::Server
+ properties:
+# config_drive: "True"
+ name: {get_param: [pd_server_names, 0]}
+ image: {get_param: pd_image_name}
+ flavor: {get_param: pd_flavor_name}
+ availability_zone: {get_param: availabilityzone_name}
+ networks:
+ - port: {get_resource: pd01_port_5}
+ - port: {get_resource: pd02_port_6}
+ user_data_format: RAW
+
+ pd01_port_5:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+ pd02_port_6:
+ type: OS::Neutron::Port
+ properties:
+ network: {get_param: oam_net_name}
+
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index fbda1f8157..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-topology_template:
- inputs:
- param_type_comma_delimited_list:
- hidden: false
- immutable: false
- type: list
- description: param comma_delimited_list - List
- entry_schema:
- type: string
- param_type_string_default_value_with_env:
- hidden: false
- immutable: false
- type: string
- description: param value should be - HEAT_ENV_default string
- default: HEAT_ENV default string
- volume_type:
- label: FSB Volume
- hidden: false
- immutable: false
- type: string
- description: FSB Volume type
- FSB1_volume_name:
- label: FSB Volume
- hidden: false
- immutable: false
- type: string
- description: FSB Volume name
- param_constraint_length_allowed_pattern_range_hidden:
- label: User Name
- hidden: true
- immutable: false
- type: string
- description: User name to be configured for the application
- constraints:
- - max_length: 8
- - min_length: 6
- - pattern: '[A-Z]+[a-zA-Z0-9]*'
- - in_range:
- - 0
- - 10
- param_type_boolean_default_value_with_env:
- hidden: false
- immutable: false
- type: boolean
- description: param value should be false
- default: false
- param_type_string:
- hidden: false
- immutable: false
- type: string
- description: param String - string
- param_type_string_default_value:
- hidden: false
- immutable: false
- type: string
- description: param value should be - HEAT_default string
- default: HEAT_default string
- param_type_number:
- hidden: false
- immutable: false
- type: float
- description: param number - float
- param_type_boolean:
- hidden: false
- immutable: false
- type: boolean
- description: param boolean - boolean
- param_type_comma_delimited_list_default_value_with_env:
- hidden: false
- immutable: false
- type: list
- description: param value should be [b1,b2,b3,b4]
- default:
- - b1
- - b2
- - b3
- - b4
- entry_schema:
- type: string
- param_type_boolean_default_value:
- hidden: false
- immutable: false
- type: boolean
- description: param value should be true
- default: true
- param_type_number_default_value:
- hidden: false
- immutable: false
- type: float
- description: param value should be 12345
- default: 12345
- FSB_1_image:
- label: FSB Image
- hidden: false
- immutable: false
- type: string
- description: FSB Image name
- param_type_comma_delimited_list_default_value:
- hidden: false
- immutable: false
- type: list
- description: param value should be [a1,a2,a3,a4]
- default:
- - a1
- - a2
- - a3
- - a4
- entry_schema:
- type: string
- param_type_number_default_value_with_env:
- hidden: false
- immutable: false
- type: float
- description: param value should be 54321
- default: 54321
- param_type_json:
- hidden: false
- immutable: false
- type: json
- description: param json - map<String>
- param_allowed_values:
- label: Instance Type
- hidden: false
- immutable: false
- type: string
- description: Instance type for compute instances
- constraints:
- - valid_values:
- - m1.small
- - m1.medium
- - m1.large
- node_templates:
- FSB1_volume:
- type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
- properties:
- image:
- get_input: FSB_1_image
- volume_type:
- get_input: volume_type
- size: 3*1024
- name:
- get_input: FSB1_volume_name
- groups:
- parameters_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/parameters.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - FSB1_volume \ 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/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..632cd40e0c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -0,0 +1,334 @@
+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
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.compute:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ pcm_flavor_name:
+ label: PCRF CM flavor name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: pcm_flavor_name
+ type: string
+ description: flavor name of PCRF CM instance
+ default: cps
+ availabilityzone_name:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: availabilityzone_name
+ type: string
+ description: availabilityzone name
+ default: nova
+ oam_net_gw:
+ label: CPS network gateway
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: oam_net_gw
+ type: string
+ description: CPS network gateway
+ pcm_server_names:
+ label: PCRF CM server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: pcm_server_names
+ type: list
+ description: name of the PCRF CM instance
+ default:
+ - ZRDM1PCRF01PCM001
+ entry_schema:
+ type: string
+ pcm_image_name:
+ label: PCRF CM image name
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: pcm_image_name
+ type: string
+ description: PCRF CM image name
+ default: rhel2
+ net_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: net_name
+ type: string
+ sm_server_names:
+ label: SM server names
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat1
+ source_type: HEAT
+ param_name: sm_server_names
+ type: list
+ description: name of the SM instance
+ default:
+ - ZRDM1MOGX01MSM001
+ - ZRDM1MOGX01MSM002
+ entry_schema:
+ type: string
+ compute_image_name:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ - main-heat1
+ source_type: HEAT
+ param_name: compute_image_name
+ type: string
+ dummy_net_netmask_1:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main-heat2
+ source_type: HEAT
+ param_name: dummy_net_netmask_1
+ type: string
+ description: CSB internal network subnet mask
+ default: 255.255.255.0
+ node_templates:
+ server_pcm_002:
+ type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+ directives:
+ - substitutable
+ properties:
+ pcm_flavor_name:
+ get_input: pcm_flavor_name
+ service_template_filter:
+ substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml
+ availabilityzone_name:
+ get_input: availabilityzone_name
+ pcm_image_name:
+ get_input: pcm_image_name
+ pcm_server_name:
+ get_input:
+ - pcm_server_names
+ - 0
+ server_pcm_001:
+ type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+ directives:
+ - substitutable
+ properties:
+ pcm_flavor_name:
+ get_input: pcm_flavor_name
+ service_template_filter:
+ substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+ availabilityzone_name:
+ get_input: availabilityzone_name
+ pcm_image_name:
+ get_input: pcm_image_name
+ pcm_server_name:
+ get_input:
+ - pcm_server_names
+ - 0
+ server_pcm_004:
+ type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+ directives:
+ - substitutable
+ properties:
+ pcm_flavor_name:
+ get_input: pcm_flavor_name
+ service_template_filter:
+ substitute_service_template: nested-pcm_v0.2ServiceTemplate.yaml
+ availabilityzone_name:
+ get_input: availabilityzone_name
+ pcm_image_name:
+ get_input: pcm_image_name
+ pcm_server_name:
+ get_input:
+ - pcm_server_names
+ - 0
+ server_pcm_003:
+ type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+ directives:
+ - substitutable
+ properties:
+ pcm_flavor_name:
+ get_input: pcm_flavor_name
+ service_template_filter:
+ substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+ availabilityzone_name:
+ get_input: availabilityzone_name
+ pcm_image_name:
+ get_input: pcm_image_name
+ pcm_server_name:
+ get_input:
+ - pcm_server_names
+ - 0
+ server_compute:
+ type: org.openecomp.resource.vfc.nodes.heat.compute
+ properties:
+ flavor:
+ compute_flavor_name: null
+ image:
+ get_input: compute_image_name
+ config_drive:
+ get_attribute:
+ - compute_port_0
+ - tenant_id
+ - port_security_enabled
+ - device_id
+ - qos_policy
+ - allowed_address_pairs
+ - show
+ - device_owner
+ - network
+ - security_groups
+ - fixed_ips
+ - mac_address
+ - admin_state_up
+ - name
+ - subnets
+ - status
+ user_data_format:
+ get_attribute:
+ - server_pcm_001
+ - oam_net_gw
+ name:
+ compute_name: null
+ compute_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network:
+ get_input: net_name
+ server_compute_2:
+ type: org.openecomp.resource.vfc.nodes.heat.compute
+ properties:
+ flavor:
+ compute_flavor_name: null
+ image:
+ get_input: compute_image_name
+ config_drive:
+ get_attribute:
+ - compute_port_1
+ - tenant_id
+ - port_security_enabled
+ - device_id
+ - qos_policy
+ - allowed_address_pairs
+ - show
+ - device_owner
+ - network
+ - security_groups
+ - fixed_ips
+ - mac_address
+ - admin_state_up
+ - name
+ - subnets
+ - status
+ user_data_format:
+ get_attribute:
+ - server_pcm_003
+ - oam_net_gw
+ name:
+ compute_name: null
+ compute_port_1:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: false
+ floating_ip_count_required:
+ is_required: false
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network:
+ get_input: net_name
+ groups:
+ main-heat2_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main-heat2.yaml
+ description: heat template that creates PCRF Cluman stack
+ members:
+ - server_pcm_004
+ - server_pcm_003
+ - server_compute_2
+ - compute_port_1
+ main-heat1_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main-heat1.yaml
+ description: heat template that creates PCRF Cluman stack
+ members:
+ - server_pcm_002
+ - server_pcm_001
+ - server_compute
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
new file mode 100644
index 0000000000..1582a7e4b7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml
@@ -0,0 +1,394 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: nested-pcm_v0.1
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.pcm_server:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ availabilityzone_name:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ type: string
+ description: availabilityzone name
+ oam_net_gw:
+ label: CPS network gateway
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network gateway
+ pcm_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ type: string
+ description: PCRF CM image name
+ security_group_name:
+ label: security group name
+ hidden: false
+ immutable: false
+ type: string
+ description: the name of security group
+ cps_net_ip:
+ label: CPS network ip
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network ip
+ sm_server_names:
+ label: SM server names
+ hidden: false
+ immutable: false
+ type: list
+ description: name of the SM instance
+ entry_schema:
+ type: string
+ pcm_flavor_name:
+ label: PCRF CM flavor name
+ hidden: false
+ immutable: false
+ type: string
+ description: flavor name of PCRF CM instance
+ pcm_vol:
+ label: CPS Cluman Cinder Volume
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS Cluman Cinder Volume
+ pcm_server_name:
+ label: PCRF CM server name
+ hidden: false
+ immutable: false
+ type: string
+ description: PCRF CM server name
+ cps_net_name:
+ label: CPS network name
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network name
+ cps_net_mask:
+ label: CPS network mask
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network mask
+ oam_net_ip:
+ label: OAM network ip
+ hidden: false
+ immutable: false
+ type: string
+ description: OAM network ip
+ oam_net_mask:
+ label: CPS network mask
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network mask
+ oam_net_name:
+ label: OAM network name
+ hidden: false
+ immutable: false
+ type: string
+ description: OAM network name
+ node_templates:
+ pcm_port_1:
+ 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
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input: oam_net_ip
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pcm_1
+ relationship: tosca.relationships.network.BindsTo
+ server_pcm_1:
+ type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+ properties:
+ flavor:
+ get_input: pcm_flavor_name
+ availability_zone:
+ get_input: availabilityzone_name
+ image:
+ get_input: pcm_image_name
+ config_drive: true
+ user_data_format: RAW
+ name:
+ get_input: pcm_server_name
+ pcm_port_0:
+ 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
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input: cps_net_ip
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: cps
+ network:
+ get_input: cps_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pcm_1
+ relationship: tosca.relationships.network.BindsTo
+ groups:
+ nested-pcm_v0.1_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/nested-pcm_v0.1.yaml
+ description: heat template that creates PCRF Cluman stack
+ members:
+ - pcm_port_1
+ - server_pcm_1
+ - pcm_port_0
+ outputs:
+ server_pcm_id:
+ description: the pcm nova service id
+ value: server_pcm_1
+ substitution_mappings:
+ node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.1
+ capabilities:
+ disk.root.size_server_pcm_1:
+ - server_pcm_1
+ - disk.root.size
+ network.incoming.packets.rate_pcm_port_0:
+ - pcm_port_0
+ - network.incoming.packets.rate
+ network.incoming.packets.rate_pcm_port_1:
+ - pcm_port_1
+ - network.incoming.packets.rate
+ network.outpoing.packets_pcm_port_1:
+ - pcm_port_1
+ - network.outpoing.packets
+ network.outpoing.packets_pcm_port_0:
+ - pcm_port_0
+ - network.outpoing.packets
+ disk.iops_server_pcm_1:
+ - server_pcm_1
+ - disk.iops
+ disk.device.write.bytes.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.device.write.bytes.rate
+ disk.capacity_server_pcm_1:
+ - server_pcm_1
+ - disk.capacity
+ disk.write.requests_server_pcm_1:
+ - server_pcm_1
+ - disk.write.requests
+ disk.read.bytes_server_pcm_1:
+ - server_pcm_1
+ - disk.read.bytes
+ network.incoming.bytes_pcm_port_0:
+ - pcm_port_0
+ - network.incoming.bytes
+ disk.usage_server_pcm_1:
+ - server_pcm_1
+ - disk.usage
+ cpu_util_server_pcm_1:
+ - server_pcm_1
+ - cpu_util
+ vcpus_server_pcm_1:
+ - server_pcm_1
+ - vcpus
+ memory.resident_server_pcm_1:
+ - server_pcm_1
+ - memory.resident
+ network.incoming.bytes_pcm_port_1:
+ - pcm_port_1
+ - network.incoming.bytes
+ binding_pcm_port_0:
+ - pcm_port_0
+ - binding
+ binding_pcm_port_1:
+ - pcm_port_1
+ - binding
+ feature_server_pcm_1:
+ - server_pcm_1
+ - feature
+ network.outgoing.packets.rate_pcm_port_0:
+ - pcm_port_0
+ - network.outgoing.packets.rate
+ network.outgoing.packets.rate_pcm_port_1:
+ - pcm_port_1
+ - network.outgoing.packets.rate
+ disk.allocation_server_pcm_1:
+ - server_pcm_1
+ - disk.allocation
+ disk.device.write.bytes_server_pcm_1:
+ - server_pcm_1
+ - disk.device.write.bytes
+ feature_pcm_port_1:
+ - pcm_port_1
+ - feature
+ memory.usage_server_pcm_1:
+ - server_pcm_1
+ - memory.usage
+ network.outgoing.bytes_pcm_port_0:
+ - pcm_port_0
+ - network.outgoing.bytes
+ feature_pcm_port_0:
+ - pcm_port_0
+ - feature
+ cpu_server_pcm_1:
+ - server_pcm_1
+ - cpu
+ network.outgoing.bytes_pcm_port_1:
+ - pcm_port_1
+ - network.outgoing.bytes
+ attachment_pcm_port_0:
+ - pcm_port_0
+ - attachment
+ attachment_pcm_port_1:
+ - pcm_port_1
+ - attachment
+ disk.device.read.bytes_server_pcm_1:
+ - server_pcm_1
+ - disk.device.read.bytes
+ endpoint_server_pcm_1:
+ - server_pcm_1
+ - endpoint
+ disk.read.bytes.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.read.bytes.rate
+ disk.device.iops_server_pcm_1:
+ - server_pcm_1
+ - disk.device.iops
+ cpu.delta_server_pcm_1:
+ - server_pcm_1
+ - cpu.delta
+ host_server_pcm_1:
+ - server_pcm_1
+ - host
+ disk.device.capacity_server_pcm_1:
+ - server_pcm_1
+ - disk.device.capacity
+ forwarder_pcm_port_0:
+ - pcm_port_0
+ - forwarder
+ forwarder_pcm_port_1:
+ - pcm_port_1
+ - forwarder
+ disk.read.requests_server_pcm_1:
+ - server_pcm_1
+ - disk.read.requests
+ disk.device.write.requests.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.device.write.requests.rate
+ disk.ephemeral.size_server_pcm_1:
+ - server_pcm_1
+ - disk.ephemeral.size
+ disk.latency_server_pcm_1:
+ - server_pcm_1
+ - disk.latency
+ scalable_server_pcm_1:
+ - server_pcm_1
+ - scalable
+ disk.write.requests.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.write.requests.rate
+ memory_server_pcm_1:
+ - server_pcm_1
+ - memory
+ disk.device.latency_server_pcm_1:
+ - server_pcm_1
+ - disk.device.latency
+ disk.device.read.bytes.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.device.read.bytes.rate
+ network.outgoing.bytes.rate_pcm_port_1:
+ - pcm_port_1
+ - network.outgoing.bytes.rate
+ network.incoming.packets_pcm_port_0:
+ - pcm_port_0
+ - network.incoming.packets
+ disk.device.usage_server_pcm_1:
+ - server_pcm_1
+ - disk.device.usage
+ network.outgoing.bytes.rate_pcm_port_0:
+ - pcm_port_0
+ - network.outgoing.bytes.rate
+ disk.device.write.requests_server_pcm_1:
+ - server_pcm_1
+ - disk.device.write.requests
+ network.incoming.packets_pcm_port_1:
+ - pcm_port_1
+ - network.incoming.packets
+ disk.write.bytes_server_pcm_1:
+ - server_pcm_1
+ - disk.write.bytes
+ disk.device.read.requests_server_pcm_1:
+ - server_pcm_1
+ - disk.device.read.requests
+ instance_server_pcm_1:
+ - server_pcm_1
+ - instance
+ disk.device.read.requests.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.device.read.requests.rate
+ os_server_pcm_1:
+ - server_pcm_1
+ - os
+ network.incoming.bytes.rate_pcm_port_0:
+ - pcm_port_0
+ - network.incoming.bytes.rate
+ binding_server_pcm_1:
+ - server_pcm_1
+ - binding
+ disk.write.bytes.rate_server_pcm_1:
+ - server_pcm_1
+ - disk.write.bytes.rate
+ disk.device.allocation_server_pcm_1:
+ - server_pcm_1
+ - disk.device.allocation
+ network.incoming.bytes.rate_pcm_port_1:
+ - pcm_port_1
+ - network.incoming.bytes.rate
+ requirements:
+ link_pcm_port_0:
+ - pcm_port_0
+ - link
+ link_pcm_port_1:
+ - pcm_port_1
+ - link
+ dependency_server_pcm_1:
+ - server_pcm_1
+ - dependency
+ dependency_pcm_port_0:
+ - pcm_port_0
+ - dependency
+ dependency_pcm_port_1:
+ - pcm_port_1
+ - dependency
+ local_storage_server_pcm_1:
+ - server_pcm_1
+ - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml
new file mode 100644
index 0000000000..8bdff8f08b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml
@@ -0,0 +1,386 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: nested-pcm_v0.2
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+- GlobalSubstitutionTypes:
+ file: GlobalSubstitutionTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.pcm_server:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ availabilityzone_name:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ type: string
+ description: availabilityzone name
+ oam_net_gw:
+ label: CPS network gateway
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network gateway
+ pcm_image_name:
+ label: image name
+ hidden: false
+ immutable: false
+ type: string
+ description: PCRF CM image name
+ security_group_name:
+ label: security group name
+ hidden: false
+ immutable: false
+ type: string
+ description: the name of security group
+ cps_net_ip:
+ label: CPS network ip
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network ip
+ pcm_flavor_name:
+ label: PCRF CM flavor name
+ hidden: false
+ immutable: false
+ type: string
+ description: flavor name of PCRF CM instance
+ pcm_vol:
+ label: CPS Cluman Cinder Volume
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS Cluman Cinder Volume
+ pcm_server_name:
+ label: PCRF CM server name
+ hidden: false
+ immutable: false
+ type: string
+ description: PCRF CM server name
+ cps_net_name:
+ label: CPS network name
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network name
+ cps_net_mask:
+ label: CPS network mask
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network mask
+ oam_net_ip:
+ label: OAM network ip
+ hidden: false
+ immutable: false
+ type: string
+ description: OAM network ip
+ oam_net_mask:
+ label: CPS network mask
+ hidden: false
+ immutable: false
+ type: string
+ description: CPS network mask
+ oam_net_name:
+ label: OAM network name
+ hidden: false
+ immutable: false
+ type: string
+ description: OAM network name
+ node_templates:
+ pcm_port_13:
+ 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
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input: oam_net_ip
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pcm_2
+ relationship: tosca.relationships.network.BindsTo
+ pcm_port_03:
+ 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
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input: cps_net_ip
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: cps
+ network:
+ get_input: cps_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_pcm_2
+ relationship: tosca.relationships.network.BindsTo
+ server_pcm_2:
+ type: org.openecomp.resource.vfc.nodes.heat.pcm_server
+ properties:
+ flavor:
+ get_input: pcm_flavor_name
+ availability_zone:
+ get_input: availabilityzone_name
+ image:
+ get_input: pcm_image_name
+ config_drive: true
+ user_data_format: RAW
+ name:
+ get_input: pcm_server_name
+ groups:
+ nested-pcm_v0.2_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/nested-pcm_v0.2.yaml
+ description: heat template that creates PCRF Cluman stack
+ members:
+ - pcm_port_13
+ - pcm_port_03
+ - server_pcm_2
+ outputs:
+ server_pcm_id:
+ description: the pcm nova service id
+ value: server_pcm_2
+ substitution_mappings:
+ node_type: org.openecomp.resource.abstract.nodes.heat.nested-pcm_v0.2
+ capabilities:
+ disk.root.size_server_pcm_2:
+ - server_pcm_2
+ - disk.root.size
+ disk.iops_server_pcm_2:
+ - server_pcm_2
+ - disk.iops
+ feature_pcm_port_03:
+ - pcm_port_03
+ - feature
+ network.outgoing.bytes_pcm_port_13:
+ - pcm_port_13
+ - network.outgoing.bytes
+ disk.device.write.bytes.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.device.write.bytes.rate
+ disk.usage_server_pcm_2:
+ - server_pcm_2
+ - disk.usage
+ disk.capacity_server_pcm_2:
+ - server_pcm_2
+ - disk.capacity
+ disk.write.requests_server_pcm_2:
+ - server_pcm_2
+ - disk.write.requests
+ network.incoming.bytes.rate_pcm_port_13:
+ - pcm_port_13
+ - network.incoming.bytes.rate
+ disk.read.bytes_server_pcm_2:
+ - server_pcm_2
+ - disk.read.bytes
+ network.outgoing.packets.rate_pcm_port_03:
+ - pcm_port_03
+ - network.outgoing.packets.rate
+ feature_pcm_port_13:
+ - pcm_port_13
+ - feature
+ network.outgoing.bytes_pcm_port_03:
+ - pcm_port_03
+ - network.outgoing.bytes
+ cpu_util_server_pcm_2:
+ - server_pcm_2
+ - cpu_util
+ vcpus_server_pcm_2:
+ - server_pcm_2
+ - vcpus
+ memory.resident_server_pcm_2:
+ - server_pcm_2
+ - memory.resident
+ cpu_server_pcm_2:
+ - server_pcm_2
+ - cpu
+ feature_server_pcm_2:
+ - server_pcm_2
+ - feature
+ disk.device.write.bytes_server_pcm_2:
+ - server_pcm_2
+ - disk.device.write.bytes
+ disk.device.iops_server_pcm_2:
+ - server_pcm_2
+ - disk.device.iops
+ disk.allocation_server_pcm_2:
+ - server_pcm_2
+ - disk.allocation
+ network.outgoing.bytes.rate_pcm_port_13:
+ - pcm_port_13
+ - network.outgoing.bytes.rate
+ network.incoming.packets.rate_pcm_port_13:
+ - pcm_port_13
+ - network.incoming.packets.rate
+ binding_pcm_port_13:
+ - pcm_port_13
+ - binding
+ memory.usage_server_pcm_2:
+ - server_pcm_2
+ - memory.usage
+ disk.device.read.bytes_server_pcm_2:
+ - server_pcm_2
+ - disk.device.read.bytes
+ host_server_pcm_2:
+ - server_pcm_2
+ - host
+ endpoint_server_pcm_2:
+ - server_pcm_2
+ - endpoint
+ disk.read.bytes.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.read.bytes.rate
+ attachment_pcm_port_13:
+ - pcm_port_13
+ - attachment
+ network.outgoing.packets.rate_pcm_port_13:
+ - pcm_port_13
+ - network.outgoing.packets.rate
+ forwarder_pcm_port_13:
+ - pcm_port_13
+ - forwarder
+ disk.device.capacity_server_pcm_2:
+ - server_pcm_2
+ - disk.device.capacity
+ network.incoming.bytes.rate_pcm_port_03:
+ - pcm_port_03
+ - network.incoming.bytes.rate
+ cpu.delta_server_pcm_2:
+ - server_pcm_2
+ - cpu.delta
+ disk.device.write.requests.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.device.write.requests.rate
+ network.incoming.packets.rate_pcm_port_03:
+ - pcm_port_03
+ - network.incoming.packets.rate
+ disk.read.requests_server_pcm_2:
+ - server_pcm_2
+ - disk.read.requests
+ disk.ephemeral.size_server_pcm_2:
+ - server_pcm_2
+ - disk.ephemeral.size
+ disk.latency_server_pcm_2:
+ - server_pcm_2
+ - disk.latency
+ network.outpoing.packets_pcm_port_13:
+ - pcm_port_13
+ - network.outpoing.packets
+ attachment_pcm_port_03:
+ - pcm_port_03
+ - attachment
+ network.outgoing.bytes.rate_pcm_port_03:
+ - pcm_port_03
+ - network.outgoing.bytes.rate
+ binding_pcm_port_03:
+ - pcm_port_03
+ - binding
+ disk.write.requests.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.write.requests.rate
+ scalable_server_pcm_2:
+ - server_pcm_2
+ - scalable
+ memory_server_pcm_2:
+ - server_pcm_2
+ - memory
+ disk.device.read.bytes.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.device.read.bytes.rate
+ disk.device.latency_server_pcm_2:
+ - server_pcm_2
+ - disk.device.latency
+ network.incoming.bytes_pcm_port_03:
+ - pcm_port_03
+ - network.incoming.bytes
+ disk.device.usage_server_pcm_2:
+ - server_pcm_2
+ - disk.device.usage
+ network.incoming.packets_pcm_port_13:
+ - pcm_port_13
+ - network.incoming.packets
+ forwarder_pcm_port_03:
+ - pcm_port_03
+ - forwarder
+ disk.device.write.requests_server_pcm_2:
+ - server_pcm_2
+ - disk.device.write.requests
+ disk.write.bytes_server_pcm_2:
+ - server_pcm_2
+ - disk.write.bytes
+ os_server_pcm_2:
+ - server_pcm_2
+ - os
+ instance_server_pcm_2:
+ - server_pcm_2
+ - instance
+ disk.device.read.requests_server_pcm_2:
+ - server_pcm_2
+ - disk.device.read.requests
+ disk.device.read.requests.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.device.read.requests.rate
+ network.incoming.packets_pcm_port_03:
+ - pcm_port_03
+ - network.incoming.packets
+ network.incoming.bytes_pcm_port_13:
+ - pcm_port_13
+ - network.incoming.bytes
+ network.outpoing.packets_pcm_port_03:
+ - pcm_port_03
+ - network.outpoing.packets
+ disk.write.bytes.rate_server_pcm_2:
+ - server_pcm_2
+ - disk.write.bytes.rate
+ binding_server_pcm_2:
+ - server_pcm_2
+ - binding
+ disk.device.allocation_server_pcm_2:
+ - server_pcm_2
+ - disk.device.allocation
+ requirements:
+ dependency_pcm_port_13:
+ - pcm_port_13
+ - dependency
+ dependency_server_pcm_2:
+ - server_pcm_2
+ - dependency
+ dependency_pcm_port_03:
+ - pcm_port_03
+ - dependency
+ link_pcm_port_03:
+ - pcm_port_03
+ - link
+ link_pcm_port_13:
+ - pcm_port_13
+ - link
+ local_storage_server_pcm_2:
+ - server_pcm_2
+ - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json
new file mode 100644
index 0000000000..86450ec848
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/MANIFEST.json
@@ -0,0 +1,37 @@
+{
+ "name": "vEP_JSA_Net",
+ "description": "Version 2.0 02-09-2016 (Authors: John Doe, user PROD)",
+ "version": "2013-05-23",
+ "data": [
+ {
+ "file": "main-heat1.yaml",
+ "type": "HEAT",
+ "isBase": "true",
+ "data": [
+ {
+ "file": "main-heat1.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ },
+ {
+ "file": "main-heat2.yaml",
+ "type": "HEAT",
+ "isBase": "false",
+ "data": [
+ {
+ "file": "main-heat2.env",
+ "type": "HEAT_ENV"
+ }
+ ]
+ },
+ {
+ "file": "nested-pcm_v0.1.yaml",
+ "type": "HEAT"
+ },
+ {
+ "file": "nested-pcm_v0.2.yaml",
+ "type": "HEAT"
+ }
+ ]
+} \ 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/parameters/multipleHeatWithNested/inputs/main-heat1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env
new file mode 100644
index 0000000000..d0d4d3f8e6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.env
@@ -0,0 +1,6 @@
+parameters:
+ pcm_server_names: ZRDM1PCRF01PCM001
+ pcm_image_name: rhel2
+ pcm_flavor_name: cps
+ availabilityzone_name: nova
+ sm_server_names: ZRDM1MOGX01MSM001,ZRDM1MOGX01MSM002 \ 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/parameters/multipleHeatWithNested/inputs/main-heat1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml
new file mode 100644
index 0000000000..dd58b506d7
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat1.yaml
@@ -0,0 +1,65 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+ pcm_server_names:
+ type: comma_delimited_list
+ label: PCRF CM server names
+ description: name of the PCRF CM instance
+ pcm_image_name:
+ type: string
+ label: PCRF CM image name
+ description: PCRF CM image name
+ pcm_flavor_name:
+ type: string
+ label: PCRF CM flavor name
+ description: flavor name of PCRF CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_gw:
+ type: string
+ label: CPS network gateway
+ description: CPS network gateway
+ compute_image_name:
+ type: string
+ net_name:
+ type: string
+ sm_server_names:
+ type: comma_delimited_list
+ label: SM server names
+ description: name of the SM instance
+
+resources:
+ server_pcm_001:
+ type: nested-pcm_v0.1.yaml
+ properties:
+ pcm_server_name: { get_param: [pcm_server_names, 0] }
+ pcm_image_name: { get_param: pcm_image_name }
+ pcm_flavor_name: { get_param: pcm_flavor_name }
+ availabilityzone_name: { get_param: availabilityzone_name }
+
+ server_pcm_002:
+ type: nested-pcm_v0.2.yaml
+ properties:
+ pcm_server_name: { get_param: [pcm_server_names, 0] }
+ pcm_image_name: { get_param: pcm_image_name }
+ pcm_flavor_name: { get_param: pcm_flavor_name }
+ availabilityzone_name: { get_param: availabilityzone_name }
+
+ server_compute:
+ type: OS::Nova::Server
+ properties:
+ config_drive: {get_attr: [compute_port_0]}
+ name: { compute_name }
+ image: { get_param: compute_image_name }
+ flavor: { compute_flavor_name }
+ user_data_format: { get_attr: [server_pcm_001 , oam_net_gw] }
+ user_data: { get_attr: [server_pcm_001]}
+
+ compute_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: 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/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env
new file mode 100644
index 0000000000..062043d5b2
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.env
@@ -0,0 +1,6 @@
+parameters:
+ pcm_server_names: ZRDM1PCRF01PCM001
+ pcm_image_name: rhel2
+ pcm_flavor_name: cps
+ availabilityzone_name: nova
+ dummy_net_netmask_1: 255.255.255.0 \ 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/parameters/multipleHeatWithNested/inputs/main-heat2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml
new file mode 100644
index 0000000000..0f8aa96e48
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/main-heat2.yaml
@@ -0,0 +1,64 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+ pcm_server_names:
+ type: comma_delimited_list
+ label: PCRF CM server names
+ description: name of the PCRF CM instance
+ pcm_image_name:
+ type: string
+ label: PCRF CM image name
+ description: PCRF CM image name
+ pcm_flavor_name:
+ type: string
+ label: PCRF CM flavor name
+ description: flavor name of PCRF CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_gw:
+ type: string
+ label: CPS network gateway
+ description: CPS network gateway
+ compute_image_name:
+ type: string
+ net_name:
+ type: string
+ dummy_net_netmask_1:
+ type: string
+ description: CSB internal network subnet mask
+
+resources:
+ server_pcm_003:
+ type: nested-pcm_v0.1.yaml
+ properties:
+ pcm_server_name: { get_param: [pcm_server_names, 0] }
+ pcm_image_name: { get_param: pcm_image_name }
+ pcm_flavor_name: { get_param: pcm_flavor_name }
+ availabilityzone_name: { get_param: availabilityzone_name }
+
+ server_pcm_004:
+ type: nested-pcm_v0.2.yaml
+ properties:
+ pcm_server_name: { get_param: [pcm_server_names, 0] }
+ pcm_image_name: { get_param: pcm_image_name }
+ pcm_flavor_name: { get_param: pcm_flavor_name }
+ availabilityzone_name: { get_param: availabilityzone_name }
+
+ server_compute_2:
+ type: OS::Nova::Server
+ properties:
+ config_drive: {get_attr: [compute_port_1]}
+ name: { compute_name }
+ image: { get_param: compute_image_name }
+ flavor: { compute_flavor_name }
+ user_data_format: { get_attr: [server_pcm_003 , oam_net_gw] }
+ user_data: { get_attr: [server_pcm_003]}
+
+ compute_port_1:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: 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/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml
new file mode 100644
index 0000000000..39107edb95
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.1.yaml
@@ -0,0 +1,98 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+ pcm_server_name:
+ type: string
+ label: PCRF CM server name
+ description: PCRF CM server name
+ pcm_image_name:
+ type: string
+ label: image name
+ description: PCRF CM image name
+ pcm_flavor_name:
+ type: string
+ label: PCRF CM flavor name
+ description: flavor name of PCRF CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ cps_net_name:
+ type: string
+ label: CPS network name
+ description: CPS network name
+ cps_net_ip:
+ type: string
+ label: CPS network ip
+ description: CPS network ip
+ cps_net_mask:
+ type: string
+ label: CPS network mask
+ description: CPS network mask
+ oam_net_name:
+ type: string
+ label: OAM network name
+ description: OAM network name
+ oam_net_ip:
+ type: string
+ label: OAM network ip
+ description: OAM network ip
+ oam_net_gw:
+ type: string
+ label: CPS network gateway
+ description: CPS network gateway
+ oam_net_mask:
+ type: string
+ label: CPS network mask
+ description: CPS network mask
+ pcm_vol:
+ type: string
+ label: CPS Cluman Cinder Volume
+ description: CPS Cluman Cinder Volume
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ sm_server_names:
+ type: comma_delimited_list
+ label: SM server names
+ description: name of the SM instance
+
+resources:
+ server_pcm_1:
+ type: OS::Nova::Server
+ properties:
+ config_drive: "True"
+ name: { get_param: pcm_server_name }
+ image: { get_param: pcm_image_name }
+ flavor: { get_param: pcm_flavor_name }
+ availability_zone: { get_param: availabilityzone_name }
+ networks:
+ - port: { get_resource: pcm_port_0}
+ - port: { get_resource: pcm_port_1}
+ block_device_mapping:
+ - device_name: vdb
+ volume_id: { get_param: pcm_vol}
+ user_data_format: RAW
+
+ pcm_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: cps_net_name }
+ fixed_ips:
+ - ip_address: { get_param: cps_net_ip }
+ security_groups: [{ get_param: security_group_name }]
+
+ pcm_port_1:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: oam_net_name }
+ fixed_ips:
+ - ip_address: { get_param: oam_net_ip }
+ security_groups: [{ get_param: security_group_name }]
+outputs:
+ server_pcm_id:
+ description: the pcm nova service id
+ value: { get_resource: server_pcm_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/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml
new file mode 100644
index 0000000000..9974df572a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/inputs/nested-pcm_v0.2.yaml
@@ -0,0 +1,94 @@
+heat_template_version: 2013-05-23
+
+description: heat template that creates PCRF Cluman stack
+
+parameters:
+ pcm_server_name:
+ type: string
+ label: PCRF CM server name
+ description: PCRF CM server name
+ pcm_image_name:
+ type: string
+ label: image name
+ description: PCRF CM image name
+ pcm_flavor_name:
+ type: string
+ label: PCRF CM flavor name
+ description: flavor name of PCRF CM instance
+ availabilityzone_name:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ cps_net_name:
+ type: string
+ label: CPS network name
+ description: CPS network name
+ cps_net_ip:
+ type: string
+ label: CPS network ip
+ description: CPS network ip
+ cps_net_mask:
+ type: string
+ label: CPS network mask
+ description: CPS network mask
+ oam_net_name:
+ type: string
+ label: OAM network name
+ description: OAM network name
+ oam_net_ip:
+ type: string
+ label: OAM network ip
+ description: OAM network ip
+ oam_net_gw:
+ type: string
+ label: CPS network gateway
+ description: CPS network gateway
+ oam_net_mask:
+ type: string
+ label: CPS network mask
+ description: CPS network mask
+ pcm_vol:
+ type: string
+ label: CPS Cluman Cinder Volume
+ description: CPS Cluman Cinder Volume
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+
+resources:
+ server_pcm_2:
+ type: OS::Nova::Server
+ properties:
+ config_drive: "True"
+ name: { get_param: pcm_server_name }
+ image: { get_param: pcm_image_name }
+ flavor: { get_param: pcm_flavor_name }
+ availability_zone: { get_param: availabilityzone_name }
+ networks:
+ - port: { get_resource: pcm_port_03}
+ - port: { get_resource: pcm_port_13}
+ block_device_mapping:
+ - device_name: vdb
+ volume_id: { get_param: pcm_vol}
+ user_data_format: RAW
+
+ pcm_port_03:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: cps_net_name }
+ fixed_ips:
+ - ip_address: { get_param: cps_net_ip }
+ security_groups: [{ get_param: security_group_name }]
+
+ pcm_port_13:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: oam_net_name }
+ fixed_ips:
+ - ip_address: { get_param: oam_net_ip }
+ security_groups: [{ get_param: security_group_name }]
+outputs:
+ server_pcm_id:
+ description: the pcm nova service id
+ value: { get_resource: server_pcm_2 } \ 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/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..b44cb69060
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/MainServiceTemplate.yaml
@@ -0,0 +1,246 @@
+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:
+ cmaui_names:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ cmaui_cinder_volume_size:
+ label: CMAUI Cinder volume size
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
+ type: float
+ description: the size of the CMAUI Cinder volume
+ timezone:
+ label: timezone
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: timezone
+ type: string
+ description: timezone
+ security_group_name:
+ label: 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: the name of security group
+ oam_network_netmask:
+ label: oam network netmask
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_netmask
+ type: string
+ description: oam network gateway
+ cmaui_image:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
+ type: string
+ description: Image for CMAUI server
+ 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 VNF instance
+ default: This_is_ths_MMSC-CMAUI_id
+ cmaui_flavor:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
+ type: string
+ description: Flavor for CMAUI server
+ oam_network_gateway:
+ label: oam network gateway
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_gateway
+ type: string
+ description: oam network gateway
+ 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:
+ label: CMAUI oam_net IP addresses
+ 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: list
+ description: CMAUI oam_net IP addresses
+ entry_schema:
+ type: string
+ external_dns:
+ label: dns server
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_dns
+ type: string
+ description: dns server
+ 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: UID of OAM network
+ external_ntp:
+ label: ntp server
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_ntp
+ type: string
+ description: ntp server
+ CMAUI_volume_type:
+ label: CMAUI vm volume type
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
+ type: string
+ description: the name of the target volume backend
+ node_templates:
+ server_cmaui_1:
+ type: org.openecomp.resource.abstract.nodes.heat.nested
+ directives:
+ - substitutable
+ properties:
+ cmaui_names:
+ get_input:
+ - cmaui_names
+ - 0
+ service_template_filter:
+ substitute_service_template: nestedServiceTemplate.yaml
+ cmaui_image:
+ get_input: cmaui_image
+ cmaui_flavor:
+ get_input: cmaui_flavor
+ availability_zone_0:
+ get_input: availability_zone_0
+ groups:
+ main_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/main.yml
+ description: cmaui server template for vMMSC
+ members:
+ - server_cmaui_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml
new file mode 100644
index 0000000000..ae852574f3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml
@@ -0,0 +1,381 @@
+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
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.cmaui:
+ derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
+topology_template:
+ inputs:
+ cmaui_names:
+ hidden: false
+ immutable: false
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
+ cmaui_cinder_volume_size:
+ label: CMAUI Cinder volume size
+ hidden: false
+ immutable: false
+ type: float
+ description: the size of the CMAUI Cinder volume
+ timezone:
+ label: timezone
+ hidden: false
+ immutable: false
+ type: string
+ description: timezone
+ security_group_name:
+ label: security group name
+ hidden: false
+ immutable: false
+ type: string
+ description: the name of security group
+ cmaui_volume:
+ label: CMAUI volume size
+ hidden: false
+ immutable: false
+ type: string
+ description: Volume for CMAUI server
+ oam_network_netmask:
+ label: oam network netmask
+ hidden: false
+ immutable: false
+ type: string
+ description: oam network gateway
+ cmaui_image:
+ hidden: false
+ immutable: false
+ type: string
+ description: Image for CMAUI server
+ vnf_id:
+ hidden: false
+ immutable: false
+ type: string
+ description: Unique ID for this VNF instance
+ default: This_is_ths_MMSC-CMAUI_id
+ cmaui_flavor:
+ hidden: false
+ immutable: false
+ type: string
+ description: Flavor for CMAUI server
+ oam_network_gateway:
+ label: oam network gateway
+ hidden: false
+ immutable: false
+ type: string
+ description: oam network gateway
+ out_cmaui_volume:
+ label: CMAUI vm volume type
+ hidden: false
+ immutable: false
+ type: string
+ description: the name of the target volume backend
+ availability_zone_0:
+ label: availabilityzone name
+ hidden: false
+ immutable: false
+ type: string
+ description: availabilityzone name
+ cmaui_oam_ips:
+ label: CMAUI oam_net IP addresses
+ hidden: false
+ immutable: false
+ type: list
+ description: CMAUI oam_net IP addresses
+ entry_schema:
+ type: string
+ external_dns:
+ label: dns server
+ hidden: false
+ immutable: false
+ type: string
+ description: dns server
+ oam_net_name:
+ hidden: false
+ immutable: false
+ type: string
+ description: UID of OAM network
+ external_ntp:
+ label: ntp server
+ hidden: false
+ immutable: false
+ type: string
+ description: ntp server
+ CMAUI_volume_type:
+ label: CMAUI vm volume type
+ hidden: false
+ immutable: false
+ type: string
+ description: the name of the target volume backend
+ 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
+ metadata:
+ vnf_id:
+ get_input: vnf_id
+ user_data_format: RAW
+ name:
+ get_input:
+ - cmaui_names
+ - 0
+ requirements:
+ - local_storage:
+ capability: tosca.capabilities.Attachment
+ node: cmaui_volume
+ relationship: cmaui_volume_attachment
+ cmaui_volume:
+ 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_port_0:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ replacement_policy: AUTO
+ ip_requirements:
+ - ip_version: 4
+ ip_count_required:
+ is_required: true
+ floating_ip_count_required:
+ is_required: false
+ security_groups:
+ - get_input: security_group_name
+ fixed_ips:
+ - ip_address:
+ get_input:
+ - cmaui_oam_ips
+ - 0
+ mac_requirements:
+ mac_count_required:
+ is_required: false
+ network_role_tag: oam
+ network:
+ get_input: oam_net_name
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: server_cmaui_2
+ relationship: tosca.relationships.network.BindsTo
+ relationship_templates:
+ cmaui_volume_attachment:
+ type: org.openecomp.relationships.VolumeAttachesTo
+ properties:
+ volume_id: cmaui_volume
+ instance_uuid: server_cmaui_2
+ groups:
+ a_vol_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/a_vol.yml
+ description: volume
+ members:
+ - cmaui_volume
+ nested_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/nested.yml
+ description: cmaui server template for vMMSC
+ members:
+ - server_cmaui_2
+ - cmaui_port_0
+ outputs:
+ out_cmaui_volume:
+ value: cmaui_volume
+ substitution_mappings:
+ node_type: org.openecomp.resource.abstract.nodes.heat.nested
+ capabilities:
+ 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
+ disk.device.usage_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.usage
+ network.incoming.packets.rate_cmaui_port_0:
+ - cmaui_port_0
+ - network.incoming.packets.rate
+ disk.write.bytes_server_cmaui_2:
+ - server_cmaui_2
+ - disk.write.bytes
+ feature_server_cmaui_2:
+ - server_cmaui_2
+ - feature
+ disk.device.latency_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.latency
+ disk.allocation_server_cmaui_2:
+ - server_cmaui_2
+ - disk.allocation
+ feature_cmaui_port_0:
+ - cmaui_port_0
+ - feature
+ binding_server_cmaui_2:
+ - server_cmaui_2
+ - binding
+ 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
+ vcpus_server_cmaui_2:
+ - server_cmaui_2
+ - vcpus
+ scalable_server_cmaui_2:
+ - server_cmaui_2
+ - scalable
+ network.outgoing.packets.rate_cmaui_port_0:
+ - cmaui_port_0
+ - network.outgoing.packets.rate
+ disk.read.requests_server_cmaui_2:
+ - server_cmaui_2
+ - disk.read.requests
+ attachment_cmaui_port_0:
+ - cmaui_port_0
+ - attachment
+ network.outgoing.bytes_cmaui_port_0:
+ - cmaui_port_0
+ - network.outgoing.bytes
+ disk.write.requests_server_cmaui_2:
+ - server_cmaui_2
+ - disk.write.requests
+ disk.device.iops_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.iops
+ disk.usage_server_cmaui_2:
+ - server_cmaui_2
+ - disk.usage
+ 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
+ endpoint_server_cmaui_2:
+ - server_cmaui_2
+ - endpoint
+ disk.read.bytes_server_cmaui_2:
+ - server_cmaui_2
+ - disk.read.bytes
+ os_server_cmaui_2:
+ - server_cmaui_2
+ - os
+ forwarder_cmaui_port_0:
+ - cmaui_port_0
+ - forwarder
+ 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
+ memory_server_cmaui_2:
+ - server_cmaui_2
+ - memory
+ cpu_server_cmaui_2:
+ - server_cmaui_2
+ - cpu
+ disk.device.allocation_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.allocation
+ host_server_cmaui_2:
+ - server_cmaui_2
+ - host
+ network.incoming.packets_cmaui_port_0:
+ - cmaui_port_0
+ - network.incoming.packets
+ disk.ephemeral.size_server_cmaui_2:
+ - server_cmaui_2
+ - disk.ephemeral.size
+ disk.capacity_server_cmaui_2:
+ - server_cmaui_2
+ - disk.capacity
+ instance_server_cmaui_2:
+ - server_cmaui_2
+ - instance
+ binding_cmaui_port_0:
+ - cmaui_port_0
+ - binding
+ feature_cmaui_volume:
+ - cmaui_volume
+ - feature
+ network.incoming.bytes.rate_cmaui_port_0:
+ - cmaui_port_0
+ - network.incoming.bytes.rate
+ disk.iops_server_cmaui_2:
+ - server_cmaui_2
+ - disk.iops
+ disk.device.write.requests_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.write.requests
+ disk.device.read.requests_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.read.requests
+ network.outpoing.packets_cmaui_port_0:
+ - cmaui_port_0
+ - network.outpoing.packets
+ disk.read.bytes.rate_server_cmaui_2:
+ - server_cmaui_2
+ - disk.read.bytes.rate
+ 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
+ network.outgoing.bytes.rate_cmaui_port_0:
+ - cmaui_port_0
+ - network.outgoing.bytes.rate
+ disk.latency_server_cmaui_2:
+ - server_cmaui_2
+ - disk.latency
+ cpu_util_server_cmaui_2:
+ - server_cmaui_2
+ - cpu_util
+ attachment_cmaui_volume:
+ - cmaui_volume
+ - attachment
+ network.incoming.bytes_cmaui_port_0:
+ - cmaui_port_0
+ - network.incoming.bytes
+ disk.device.write.bytes.rate_server_cmaui_2:
+ - server_cmaui_2
+ - disk.device.write.bytes.rate
+ memory.usage_server_cmaui_2:
+ - server_cmaui_2
+ - memory.usage
+ requirements:
+ dependency_cmaui_port_0:
+ - cmaui_port_0
+ - dependency
+ link_cmaui_port_0:
+ - cmaui_port_0
+ - link
+ local_storage_server_cmaui_2:
+ - server_cmaui_2
+ - local_storage
+ dependency_server_cmaui_2:
+ - server_cmaui_2
+ - dependency
+ dependency_cmaui_volume:
+ - cmaui_volume
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json
new file mode 100644
index 0000000000..c0bfc30a04
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/MANIFEST.json
@@ -0,0 +1,24 @@
+{
+ "name": "vMME_Small",
+ "description": "HOT template to create 2 cinder volume attachment",
+ "version": "2013-05-23",
+ "data": [
+ {
+ "file": "nested.yml",
+ "type": "HEAT",
+ "isBase": "false",
+ "data": [
+ {
+ "file": "a_vol.yml",
+ "type": "HEAT_VOL",
+ "isBase": "false"
+ }
+ ]
+ },
+ {
+ "file": "main.yml",
+ "type": "HEAT",
+ "isBase": "false"
+ }
+ ]
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml
new file mode 100644
index 0000000000..a9f72bcecf
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/a_vol.yml
@@ -0,0 +1,24 @@
+heat_template_version: 2013-05-23
+
+description: volume
+
+parameters:
+ cmaui_cinder_volume_size:
+ type: number
+ label: CMAUI Cinder volume size
+ description: the size of the CMAUI Cinder volume
+ CMAUI_volume_type:
+ type: string
+ label: CMAUI vm volume type
+ description: the name of the target volume backend
+
+resources:
+ cmaui_volume:
+ type: OS::Cinder::Volume
+ properties:
+ size: {get_param: cmaui_cinder_volume_size}
+ volume_type: {get_param: CMAUI_volume_type}
+
+outputs:
+ out_cmaui_volume:
+ value: {get_resource: cmaui_volume} \ 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/parameters/nestedWithAssociatedHeat/inputs/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml
new file mode 100644
index 0000000000..0894686026
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/main.yml
@@ -0,0 +1,71 @@
+heat_template_version: 2013-05-23
+
+description: cmaui server template for vMMSC
+
+parameters:
+ vnf_id:
+ type: string
+ description: Unique ID for this VNF instance
+ default: This_is_ths_MMSC-CMAUI_id
+ cmaui_names:
+ type: comma_delimited_list
+ description: CMAUI1, CMAUI2 server names
+ cmaui_image:
+ type: string
+ description: Image for CMAUI server
+ cmaui_flavor:
+ type: string
+ description: Flavor for CMAUI server
+ cmaui_cinder_volume_size:
+ type: number
+ label: CMAUI Cinder volume size
+ description: the size of the CMAUI Cinder volume
+ availability_zone_0:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_name:
+ type: string
+ description: UID of OAM network
+ oam_network_netmask:
+ type: string
+ label: oam network netmask
+ description: oam network gateway
+ oam_network_gateway:
+ type: string
+ label: oam network gateway
+ description: oam network gateway
+ external_dns:
+ type: string
+ label: dns server
+ description: dns server
+ external_ntp:
+ type: string
+ label: ntp server
+ description: ntp server
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ timezone:
+ type: string
+ label: timezone
+ description: timezone
+ cmaui_oam_ips:
+ type: comma_delimited_list
+ label: CMAUI oam_net IP addresses
+ description: CMAUI oam_net IP addresses
+ CMAUI_volume_type:
+ type: string
+ label: CMAUI vm volume type
+ description: the name of the target volume backend
+
+resources:
+
+ server_cmaui_1:
+ type: nested.yml
+ properties:
+ cmaui_names: { get_param: [cmaui_names, 0]}
+ cmaui_image: { get_param: cmaui_image }
+ availability_zone_0: { get_param: availability_zone_0 }
+ cmaui_flavor: { get_param: cmaui_flavor } \ 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/parameters/nestedWithAssociatedHeat/inputs/nested.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml
new file mode 100644
index 0000000000..d205cee2be
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/inputs/nested.yml
@@ -0,0 +1,116 @@
+heat_template_version: 2013-05-23
+
+description: cmaui server template for vMMSC
+
+parameters:
+ vnf_id:
+ type: string
+ description: Unique ID for this VNF instance
+ default: This_is_ths_MMSC-CMAUI_id
+ cmaui_names:
+ type: comma_delimited_list
+ description: CMAUI1, CMAUI2 server names
+ cmaui_image:
+ type: string
+ description: Image for CMAUI server
+ cmaui_flavor:
+ type: string
+ description: Flavor for CMAUI server
+ cmaui_volume:
+ type: string
+ label: CMAUI volume size
+ description: Volume for CMAUI server
+ cmaui_cinder_volume_size:
+ type: number
+ label: CMAUI Cinder volume size
+ description: the size of the CMAUI Cinder volume
+ availability_zone_0:
+ type: string
+ label: availabilityzone name
+ description: availabilityzone name
+ oam_net_name:
+ type: string
+ description: UID of OAM network
+ oam_network_netmask:
+ type: string
+ label: oam network netmask
+ description: oam network gateway
+ oam_network_gateway:
+ type: string
+ label: oam network gateway
+ description: oam network gateway
+ external_dns:
+ type: string
+ label: dns server
+ description: dns server
+ external_ntp:
+ type: string
+ label: ntp server
+ description: ntp server
+ security_group_name:
+ type: string
+ label: security group name
+ description: the name of security group
+ timezone:
+ type: string
+ label: timezone
+ description: timezone
+ cmaui_oam_ips:
+ type: comma_delimited_list
+ label: CMAUI oam_net IP addresses
+ description: CMAUI oam_net IP addresses
+ CMAUI_volume_type:
+ type: string
+ label: CMAUI vm volume type
+ description: the name of the target volume backend
+ out_cmaui_volume:
+ type: string
+ label: CMAUI vm volume type
+ description: the name of the target volume backend
+
+resources:
+
+ cmaui_port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: oam_net_name }
+ fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}]
+ security_groups: [{get_param: security_group_name}]
+ replacement_policy: AUTO
+
+ cmaui_volume_attachment:
+ type: OS::Cinder::VolumeAttachment
+ properties:
+ volume_id: {get_param: out_cmaui_volume}
+ instance_uuid: {get_resource: server_cmaui_2}
+
+ server_cmaui_2:
+ 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_0 }
+ metadata:
+ vnf_id: { get_param: vnf_id }
+ user_data:
+ str_replace:
+ template: |
+ cmaui.mgmt.ip=${cmaui.mgmt.ip}
+ cmaui.mgmt.netmask=${cmaui.mgmt.netmask}
+ cmaui.mgmt.gateway=${cmaui.mgmt.gateway}
+ cmaui.external.dns=${cmaui.external.dns}
+ cmaui.external.ntp=${cmaui.external.ntp}
+ cmaui.node=${cmaui.node}
+ cmaui.timezone=${cmaui.timezone}
+ params:
+ ${cmaui.mgmt.ip}: {get_param: [cmaui_oam_ips, 0]}
+ ${cmaui.mgmt.netmask}: {get_param: oam_network_netmask}
+ ${cmaui.mgmt.gateway}: {get_param: oam_network_gateway}
+ ${cmaui.external.dns}: {get_param: external_dns}
+ ${cmaui.external.ntp}: {get_param: external_ntp}
+ ${cmaui.node}: {get_param: [cmaui_names, 0]}
+ ${cmaui.timezone}: {get_param: timezone}
+ user_data_format: RAW \ 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/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml
new file mode 100644
index 0000000000..cbf9ff1951
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/expectedoutputfiles/MainServiceTemplate.yaml
@@ -0,0 +1,301 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: Main
+imports:
+- openecomp_heat_index:
+ file: openecomp-heat/_index.yml
+topology_template:
+ inputs:
+ param_type_comma_delimited_list:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_comma_delimited_list
+ type: list
+ description: param comma_delimited_list - List
+ entry_schema:
+ type: string
+ param_type_string_default_value_with_env:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_string_default_value_with_env
+ type: string
+ description: param value should be - HEAT_ENV_default string
+ default: HEAT_ENV default string
+ volume_type:
+ label: FSB Volume
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: volume_type
+ type: string
+ description: FSB Volume type
+ FSB1_volume_name:
+ label: FSB Volume
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: FSB1_volume_name
+ type: string
+ description: FSB Volume name
+ param_constraint_length_allowed_pattern_range_hidden:
+ label: User Name
+ hidden: true
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_constraint_length_allowed_pattern_range_hidden
+ type: string
+ description: User name to be configured for the application
+ constraints:
+ - max_length: 8
+ - min_length: 6
+ - pattern: '[A-Z]+[a-zA-Z0-9]*'
+ - in_range:
+ - 0
+ - 10
+ param_type_boolean_default_value_with_env:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_boolean_default_value_with_env
+ type: boolean
+ description: param value should be false
+ default: false
+ param_type_string:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_string
+ type: string
+ description: param String - string
+ param_type_string_default_value:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_string_default_value
+ type: string
+ description: param value should be - HEAT_default string
+ default: HEAT_default string
+ param_type_number:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_number
+ type: float
+ description: param number - float
+ param_type_boolean:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_boolean
+ type: boolean
+ description: param boolean - boolean
+ param_type_comma_delimited_list_default_value_with_env:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_comma_delimited_list_default_value_with_env
+ type: list
+ description: param value should be [b1,b2,b3,b4]
+ default:
+ - b1
+ - b2
+ - b3
+ - b4
+ entry_schema:
+ type: string
+ param_type_boolean_default_value:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_boolean_default_value
+ type: boolean
+ description: param value should be true
+ default: true
+ param_type_number_default_value:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_number_default_value
+ type: float
+ description: param value should be 12345
+ default: 12345
+ FSB_1_image:
+ label: FSB Image
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: FSB_1_image
+ type: string
+ description: FSB Image name
+ param_type_comma_delimited_list_default_value:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_comma_delimited_list_default_value
+ type: list
+ description: param value should be [a1,a2,a3,a4]
+ default:
+ - a1
+ - a2
+ - a3
+ - a4
+ entry_schema:
+ type: string
+ param_type_number_default_value_with_env:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_number_default_value_with_env
+ type: float
+ description: param value should be 54321
+ default: 54321
+ param_type_json:
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_type_json
+ type: json
+ description: param json - map<String>
+ param_allowed_values:
+ label: Instance Type
+ hidden: false
+ immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - parameters
+ source_type: HEAT
+ param_name: param_allowed_values
+ type: string
+ description: Instance type for compute instances
+ constraints:
+ - valid_values:
+ - m1.small
+ - m1.medium
+ - m1.large
+ node_templates:
+ FSB1_volume:
+ type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
+ properties:
+ image:
+ get_input: FSB_1_image
+ volume_type:
+ get_input: volume_type
+ size: 3*1024
+ name:
+ get_input: FSB1_volume_name
+ groups:
+ parameters_group:
+ type: org.openecomp.groups.heat.HeatStack
+ properties:
+ heat_file: ../Artifacts/parameters.yaml
+ description: |
+ Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
+ members:
+ - FSB1_volume
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/MANIFEST.json
index bc0e397432..bc0e397432 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/MANIFEST.json
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/MANIFEST.json
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.env
index 21978f2482..21978f2482 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.env
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.env
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.yaml
index 6f1b69ac59..6f1b69ac59 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/inputs/parameters.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/single/inputs/parameters.yaml
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml
index 7197964d8b..48620f5c56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_Network_Rule/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,86 +9,222 @@ topology_template:
start_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: start_src_ports
type: float
description: Start of src port
private_net_1_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_1_gateway
type: string
description: Private network gateway address
private_net_2_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_2_name
type: string
description: Name of private network to be created
private_net_2_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_2_gateway
type: string
description: Private network gateway address
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: policy_name
type: string
description: Virtual network id
private_net_1_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_1_name
type: string
description: Name of private network to be created
private_net_2_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_2_pool_start
type: string
description: Start of private network IP address allocation pool
private_net_2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_2_cidr
type: string
description: Private network address (CIDR notation)
private_net_1_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_1_pool_end
type: string
description: End of private network IP address allocation pool
end_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: end_src_ports
type: float
description: End of src port
apply_service:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: apply_service
type: string
description: service to apply
start_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: start_dst_ports
type: float
description: Start of dst port
end_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: end_dst_ports
type: float
description: End of dst port
private_net_1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_1_cidr
type: string
description: Private network address (CIDR notation)
private_net_1_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_1_pool_start
type: string
description: Start of private network IP address allocation pool
private_net_2_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: private_net_2_pool_end
type: string
description: End of private network IP address allocation pool
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_policy_chain
+ source_type: HEAT
+ param_name: direction
type: string
description: Direction of Policy
node_templates:
@@ -170,4 +306,4 @@ topology_template:
members:
- private_net_1
- private_policy
- - private_net_2 \ No newline at end of file
+ - private_net_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
index d1a2daf0ef..27582261d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml
@@ -26,573 +26,1397 @@ topology_template:
Internal2_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_name
type: string
default: Internal2-subnet
vlc2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-Internal2-mac
type: string
description: static mac address assigned to vlc2-Internal2
default: 00:81:37:0E:02:12
epc-sctp-a-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-rt
type: string
description: epc-sctp-a route target
default: 13979:105717
epc-sctp-b-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-rt
type: string
description: epc-sctp-b route target
default: 13979:105719
gpb-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb-flavor
type: string
description: Flavor to use for servers gpb
default: m4.xlarge4
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
default: 169.253.0.0/17
epc-sctp-a-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-pool-start
type: string
description: epc-sctp-a-net network ip pool start IP address
default: 107.243.37.3
Internal2_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_subnet_name
type: string
default: vmme_int_int_sub_2
Internal1_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_subnet_name
type: string
default: vmme_int_int_sub_1
gpb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal1-mac
type: string
description: static mac address assigned to gpb1-Internal1
default: 00:80:37:0E:01:22
gpb1-Internal1-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal1-ip
type: string
default: 169.254.0.101
FSB_1_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: image name
fsb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: static mac address assigned to fsb1-Internal2
default: 00:81:37:0E:0B:12
ncb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb_zone
type: string
description: cluster for spawnning ncb instances
default: nova
Internal2_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_name
type: string
default: vmme_int_int_2
epc-sctp-a-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-pool-end
type: string
description: epc-sctp-a-net network ip pool end IP address
default: 107.243.37.30
Internal1_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_name
type: string
default: Internal1-subnet
gpb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-name
type: string
description: Name of gpb2
default: ZRDM1MMEX33GPB002
fsb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: static mac address assigned to fsb2-Internal1
default: 00:80:37:0E:0D:12
fsb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-name
type: string
description: Name of fsb1
default: ZRDM1MMEX33FSB002
static_prefix_sctp_b_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_sctp_b_1
type: string
description: Static Prefix
default: 107.239.40.64/30
fsb2-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-oam-ip
type: string
default: 107.250.172.222
fsb2-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-flavor
type: string
description: Flavor to use for servers fsb2
default: m4.xlarge4
fsb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-Internal2-mac
type: string
description: static mac address assigned to fsb2-Internal2
default: 00:81:37:0E:0D:12
ncb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-Internal1-mac
type: string
description: static mac address assigned to ncb2-Internal1
default: 00:80:37:0E:0F:12
ncb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-name
type: string
description: Name of ncb2
default: ZRDM1MMEX33NCB002
epc-sctp-b-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-pool-end
type: string
description: epc-sctp-b-net network ip pool end IP address
default: 107.243.37.62
vlc1-gtp-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-gtp-ip
type: string
default: 107.243.37.67
epc-sctp-b-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-pool-start
type: string
description: epc-sctp-b-net network ip pool start IP address
default: 107.243.37.35
my_instance:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: my_instance
type: string
description: instance
Internal2_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
default: 'False'
Internal1_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
default: vmme_int_int_1
vlc2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-name
type: string
description: Name of vlc2
default: ZRDM1MMEX33VLC002
Internal2_ipam_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_ipam_name
type: string
default: vmme_ipam_int2
vlc1-sctp-b-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-sctp-b-ip
type: string
default: 107.243.37.35
Internal1_net_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_pool_end
type: string
default: 169.253.0.254
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
default: 169.253.0.3
ncb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-Internal1-mac
type: string
description: static mac address assigned to ncb1-Internal1
default: 00:80:37:0E:09:12
epc-gtp-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-name
type: string
description: gtp net name
default: EPC-GTP
vlc1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-Internal1-mac
type: string
description: static mac address assigned to vlc1-Internal1
default: 00:80:37:0E:01:12
gpb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-Internal1-mac
type: string
description: static mac address assigned to gpb2-Internal1
default: 00:80:37:0E:02:22
epc-gtp-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-cidr
type: string
description: gtp stubnet
default: 107.243.37.64/27
oam_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: uuid of oam network
default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
vlc_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc_zone
type: string
description: cluster for spawnning vlc instances
default: nova
vlc2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-Internal1-mac
type: string
description: static mac address assigned to vlc2-Internal1
default: 00:80:37:0E:02:12
epc-sctp-a-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-cidr
type: string
description: epc-sctp-a subnet
default: 107.243.37.0/27
Internal1_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
default: l2
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: boolean
default: false
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
default: 107.250.172.221
FSB_2_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: FSB_2_image
type: string
description: image name
vlc1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-oam-ip
type: string
default: 107.250.172.227
epc-sctp-a-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-name
type: string
description: epc-sctp-a net name
default: EPC-SCTP-A
vlc2-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-oam-ip
type: string
default: 107.250.172.228
Internal2_net_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_pool_start
type: string
default: 169.255.0.100
FSB1_volume_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: volume name
vlc1-sctp-a-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-sctp-a-ip
type: string
default: 107.243.37.3
Internal1_ipam_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_ipam_name
type: string
default: vmme_ipam_int1
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: boolean
default: false
Internal2_external:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_external
type: string
default: 'False'
Internal2_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
default: l2
vlc1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-name
type: string
description: Name of vlc1
default: ZRDM1MMEX33VLC002
vlc-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc-flavor
type: string
description: Flavor to use for servers vlc
default: m4.xlarge4
epc-gtp-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-rt
type: string
description: gtp route target
default: 13979:105715
gpb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb_zone
type: string
description: cluster for spawnning gpb instances
default: nova
Internal1-net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1-net
type: string
description: net
gpb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal2-mac
type: string
description: static mac address assigned to gpb1-Internal2
default: 00:81:37:0E:01:22
fsb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: static mac address assigned to fsb1-Internal1
default: 00:80:37:0E:0B:12
FSB2_volume_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: FSB2_volume_name
type: string
description: volume name
VMME_FSB2_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: VMME_FSB2_boot_volume
type: string
default: 089a0d11-4b15-4370-8343-3f90907b1221
fsb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: cluster for spawnning fsb instances
default: nova
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
default: 8248e794-6173-4b49-b9c3-8219b0b56f4e
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
default: 169.255.0.3
Internal1_external:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_external
type: string
default: 'False'
vlc2-sctp-a-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-sctp-a-ip
type: string
default: 107.243.37.4
ncb-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb-flavor
type: string
description: Flavor to use for servers ncb
default: m4.xlarge4
Internal1_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
default: 'False'
fsb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: Name of fsb1
default: ZRDM1MMEX33FSB001
static_prefix_gtp_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_gtp_1
type: string
description: Static Prefix
default: 107.239.40.96/30
epc-sctp-b-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-gateway
type: string
description: epc-sctp-b-net network gateway
default: 107.243.37.33
epc-sctp-b-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-cidr
type: string
description: epc-sctp-b subnet
default: 107.243.37.32/24
epc-gtp-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-pool-end
type: string
description: gtp network ip pool end IP address
default: 107.243.37.94
epc-sctp-a-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-gateway
type: string
description: epc-sctp-a-net network gateway
default: 107.243.37.1
vlc2-gtp-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-gtp-ip
type: string
default: 107.243.37.68
vlc2-sctp-b-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-sctp-b-ip
type: string
default: 107.243.37.36
Internal1_net_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_pool_start
type: string
default: 169.253.0.100
volume_size:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: volume_size
type: string
description: volume
fsb2-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-image
type: string
description: Name of image to use for server fsb2
default: MME_FSB2_15B-CP04-r5a01
ncb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-Internal2-mac
type: string
description: static mac address assigned to ncb2-Internal2
default: 00:81:37:0E:0F:12
ncb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-name
type: string
description: Name of ncb1
default: ZRDM1MMEX33NCB001
fsb1-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-image
type: string
description: Name of image to use for server fsb1
default: MME_FSB1_15B-CP04-r5a01
fsb1-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: Flavor to use for servers fsb1
default: m4.xlarge4
volume_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume
Internal2_net_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_pool_end
type: string
default: 169.255.0.254
epc-sctp-b-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-name
type: string
description: epc-sctp-b net name
default: EPC-SCTP-B
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
default: 169.255.0.0/17
epc-gtp-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-gateway
type: string
description: gtp network gateway
default: 107.243.37.65
gpb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-Internal2-mac
type: string
description: static mac address assigned to gpb2-Internal2
default: 00:81:37:0E:02:22
ncb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-Internal2-mac
type: string
description: static mac address assigned to ncb1-Internal2
default: 00:81:37:0E:09:12
epc-gtp-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-pool-start
type: string
description: gtp network ip pool start IP address
default: 107.243.37.67
static_prefix_sctp_a_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_sctp_a_1
type: string
description: Static Prefix
default: 107.239.40.32/30
gpb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-name
type: string
description: Name of gpb1
default: ZRDM1MMEX33GPB001
pxe-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: pxe-image
type: string
description: Name of image to use for server ncb
default: MME_PXE-BOOT_cxp9025898_2r5a01.qcow2
vlc1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-Internal2-mac
type: string
description: static mac address assigned to vlc1-Internal2
default: 00:81:37:0E:01:12
@@ -1519,4 +2343,4 @@ topology_template:
- VLC1_GTP
- FSB2_OAM
- GPB1_Internal2
- - GPB1_Internal1 \ No newline at end of file
+ - GPB1_Internal1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml
index 63d9b08d82..523d9c37d7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Neutron_Net/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,27 +9,67 @@ topology_template:
param_number:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: param_number
type: float
description: param number - float
jsa_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_cidr
type: string
description: CIDR of jsa log network
default: 107.243.7.128/26
param_string:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: param_string
type: string
description: param String - string
param_json:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: param_json
type: json
description: param json - map<String>
param_comma_delimited_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: param_comma_delimited_list
type: list
description: param comma_delimited_list - List
entry_schema:
@@ -38,6 +78,14 @@ topology_template:
label: User Name
hidden: true
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: user_name
type: string
description: User name to be configured for the application
constraints:
@@ -50,12 +98,28 @@ topology_template:
param_boolean:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: param_boolean
type: boolean
description: param boolean - boolean
instance_type:
label: Instance Type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: instance_type
type: string
description: Instance type for compute instances
constraints:
@@ -66,6 +130,14 @@ topology_template:
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
default: jsa_log_net_0
@@ -192,4 +264,4 @@ topology_template:
- jsa_net_test_get_attribute_3_params
- jsa_net_test_get_attribute_4_params
- jsa_net_test_get_attribute_5_params
- - jsa_net_test_full_attribute \ No newline at end of file
+ - jsa_net_test_full_attribute
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
index c97b870219..bc90c39153 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml
@@ -19,24 +19,56 @@ topology_template:
label: Internal2_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_name
type: string
description: Internal2_name
Internal1_shared:
label: Internal1_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
description: Internal1_shared
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
jsa_cidr:
label: jsa_cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_cidr
type: string
description: jsa_cidr
default: 107.243.7.128/26
@@ -44,158 +76,382 @@ topology_template:
label: availabilityzone_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone_name
fsb1-name:
label: FSB1_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: FSB1_name
pcm_image_name:
label: pcm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: pcm_image_name
Internal2_external:
label: Internal2_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_external
type: string
description: Internal2_external
Internal2_forwarding_mode:
label: Internal2_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
description: Internal2_forwarding_mode
pcrf_psm_flavor_name:
label: pcrf_psm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_flavor_name
type: string
description: pcrf_psm_flavor_name
pcrf_psm_image_name:
label: pcrf_psm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_image_name
type: string
description: pcrf_psm_image_name
pcrf_vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_vnf_id
type: string
description: prop
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
snapshot01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot01
type: string
description: prop
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
snapshot02:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot02
type: string
description: prop
fsb1-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: FSB1_internal_mac
Internal2_shared:
label: Internal2_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
description: Internal2_shared
pcm_server_name:
label: pcm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_server_name
type: string
description: pcm_server_name
cps_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: prop
Internal1_net_name:
label: Internal1_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
description: Internal1_net_name
oam_net_name:
label: oam_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: oam_net_name
fsb1-flavor:
label: FSB1_flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: FSB1_flavor
fsb1-Internal2-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: FSB1_internal_mac
pcm_vol_01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol_01
type: string
description: prop
volume_type:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
fsb1-zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-zone
type: string
description: FSB1_zone
fsb_zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: FSB1_zone
oam_net_gw:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: prop
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: network_name
type: string
description: prop
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -203,12 +459,28 @@ topology_template:
cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_ip
type: string
description: prop
jsa_net_name:
label: jsa_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: jsa_net_name
default: jsa_log_net_0
@@ -216,72 +488,176 @@ topology_template:
label: pcrf_psm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_server_name
type: string
description: pcrf_psm_server_name
pcm_flavor_name:
label: pcm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: pcm_flavor_name
oam_net_id:
label: oam_net_id
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: oam_net_id
pcrf_cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_ip
type: string
description: prop
fsb2-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: FSB1_internal_mac
Internal1_forwarding_mode:
label: Internal1_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
description: Internal1_forwarding_mode
pcrf_cps_net_name:
label: pcrf_cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_name
type: string
description: pcrf_cps_net_name
pcm_vol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol
type: string
description: prop
cps_net_name:
label: cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: cps_net_name
oam_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_ip
type: string
description: prop
oam_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: prop
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
description: prop
pcrf_security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -290,6 +666,14 @@ topology_template:
label: Internal1_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_external
type: string
description: Internal1_external
node_templates:
@@ -633,4 +1017,4 @@ topology_template:
- pcrf_server_psm
- server_VolumeTest
- FSB2
- - FSB1 \ No newline at end of file
+ - FSB1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml
index b43b9c3240..ab54493a9b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/sharedresources/expectedoutputfiles/MainServiceTemplate.yaml
@@ -15,24 +15,56 @@ topology_template:
label: FSB1_flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - sharedDefinitionOutParam
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: FSB1_flavor
fsb_zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - sharedDefinitionOutParam
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: FSB1_zone
fsb1-name:
label: FSB1_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - sharedDefinitionOutParam
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: FSB1_name
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - sharedDefinitionOutParam
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
node_templates:
@@ -68,4 +100,4 @@ topology_template:
value: static value
out_id1:
value:
- get_input: oam_net_gw \ No newline at end of file
+ get_input: oam_net_gw
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
index 609b0b2e7d..863200c011 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml
@@ -27,6 +27,14 @@ topology_template:
label: Load balancer flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_flavor_name
type: string
description: the flavor name of MMSC load balancer instance
default: m1.xlarge
@@ -34,6 +42,14 @@ topology_template:
label: ha net network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_local_ip2
type: string
description: the local ip2 of the ha network
default: 172.26.1.4
@@ -41,6 +57,14 @@ topology_template:
label: mmsc dmz_protected snat ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_dmz_protected_snat_ips
type: list
description: mmsc dmz_protected snat ips
default:
@@ -54,6 +78,14 @@ topology_template:
label: ha net network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_local_ip1
type: string
description: the local ip1 of the ha network
default: 172.26.1.3
@@ -61,6 +93,14 @@ topology_template:
label: mmsc traffic end IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_end
type: string
description: mmsc traffic end IP
default: 172.26.2.254
@@ -68,6 +108,14 @@ topology_template:
label: nems traffic end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_end
type: string
description: nems traffic end
default: 172.26.3.254
@@ -75,6 +123,14 @@ topology_template:
label: MMSC Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_cinder_volume_size
type: float
description: the size of the MMSC Cinder volume
default: 480
@@ -82,6 +138,14 @@ topology_template:
label: nems ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_cidr
type: string
description: nems internal cidr
default: 172.26.6.0/24
@@ -89,6 +153,14 @@ topology_template:
label: eca management cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_cidr
type: string
description: eca management cidr
default: 172.25.137.192/26
@@ -96,6 +168,14 @@ topology_template:
label: nems traffic start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_start
type: string
description: nems traffic start
default: 172.26.3.3
@@ -103,6 +183,14 @@ topology_template:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: oam_volume_size
type: float
description: the size of the OAM volume
default: 1800
@@ -110,6 +198,14 @@ topology_template:
label: ECA_TRX server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_names
type: list
description: ECA_TRX server names
default:
@@ -139,6 +235,14 @@ topology_template:
label: nems internal network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_name
type: string
description: nems internal network name
default: int_mms_nems_internal_net_2
@@ -146,6 +250,14 @@ topology_template:
label: nems traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_local_ip1
type: string
description: the local ip1 of the nems traffic network
default: 172.26.3.3
@@ -153,6 +265,14 @@ topology_template:
label: nems traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_local_ip2
type: string
description: the local ip2 of the nems traffic network
default: 172.26.3.4
@@ -160,6 +280,14 @@ topology_template:
label: NEMS_FE server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_names
type: list
description: NEMS_FE server names
default:
@@ -171,6 +299,14 @@ topology_template:
label: oam servers names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: eca_names
type: list
description: the names of the OAM1,OAM2 VM instances
default:
@@ -182,6 +318,14 @@ topology_template:
label: nems imap_net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_nems_imap_net_ips
type: string
description: nems imap net IPs for NEMS_BE
default: 172.26.7.13
@@ -189,6 +333,14 @@ topology_template:
label: NEMS_BE server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_names
type: string
description: NEMS_BE server names
default: ZRDM1MMSC03NBE001
@@ -196,6 +348,14 @@ topology_template:
label: NEMS traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_netmask
type: string
description: NEMS traffic network subnet mask
default: 255.255.255.0
@@ -203,6 +363,14 @@ topology_template:
label: nems_imap_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_imap_net_ips
type: list
description: nems_imap_net IPs for NEMS_FE
default:
@@ -214,6 +382,14 @@ topology_template:
label: nems_web_user_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_user_web_net_ips
type: list
description: nems_web_user_net IPs for NEMS_FE
default:
@@ -225,6 +401,14 @@ topology_template:
label: NEMS user web network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_gateway
type: string
description: NEMS user web network gateway
default: 172.26.4.1
@@ -232,6 +416,14 @@ topology_template:
label: nems imap end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_end
type: string
description: nems imap end
default: 172.26.7.254
@@ -239,12 +431,28 @@ topology_template:
label: eca traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_local_ip1
type: string
description: the local ip1 of the eca traffic network
default: 172.26.5.3
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
default: cmaui-5.0.2.5_v25
@@ -252,6 +460,14 @@ topology_template:
label: eca traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_local_ip2
type: string
description: the local ip2 of the eca traffic network
default: 172.26.5.4
@@ -259,6 +475,14 @@ topology_template:
label: nems fe volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_volume_size
type: float
description: nems fe volume size
default: 50
@@ -266,6 +490,14 @@ topology_template:
label: mmsc traffic start IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_start
type: string
description: mmsc traffic start IP
default: 172.26.2.3
@@ -273,6 +505,14 @@ topology_template:
label: ha net start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_start
type: string
description: ha net start
default: 172.26.1.3
@@ -280,6 +520,14 @@ topology_template:
label: nems imap gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_gateway
type: string
description: nems imap gateway
default: 172.26.7.1
@@ -287,6 +535,14 @@ topology_template:
label: mmsc core virtual server ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_core_virtual_server_ips
type: list
description: mmsc core virtual server ips
default:
@@ -298,6 +554,14 @@ topology_template:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
default:
@@ -309,12 +573,28 @@ topology_template:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
default: Platinum
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
default:
@@ -326,6 +606,14 @@ topology_template:
label: eca traffic net IPs for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_eca_traffic_net_ips
type: list
description: eca traffic net IPs for ECA_TRX
default:
@@ -355,6 +643,14 @@ topology_template:
label: Image for ECA TRX server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_image
type: string
description: Image for ECA TRX server
default: ECABASE
@@ -362,6 +658,14 @@ topology_template:
label: MMSC load balancer instance names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_names
type: list
description: MMSC load balancer instance names
default:
@@ -373,6 +677,14 @@ topology_template:
label: eca management end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_end
type: string
description: eca management end
default: 172.25.137.254
@@ -380,6 +692,14 @@ topology_template:
label: nems user web end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_end
type: string
description: nems user web end
default: 172.26.4.254
@@ -387,6 +707,14 @@ topology_template:
label: eca oam vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: ECA_OAM_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -394,6 +722,14 @@ topology_template:
label: eca_mgmt network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: arb_eca_mgmt_ips
type: list
description: internal eca_mgmt network ips for arb VM
default:
@@ -404,6 +740,14 @@ topology_template:
label: eca traffic cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_cidr
type: string
description: eca traffic cidr
default: 172.26.5.0/24
@@ -411,6 +755,14 @@ topology_template:
label: ha net cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_cidr
type: string
description: ha net cidr
default: 172.26.1.0/24
@@ -418,6 +770,16 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - eca_oam
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
default: nova
@@ -425,6 +787,14 @@ topology_template:
label: arb vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: ARB_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -432,6 +802,14 @@ topology_template:
label: nems_internal_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_internal_net_ips
type: list
description: nems_internal_net IPs for NEMS_FE
default:
@@ -443,6 +821,14 @@ topology_template:
label: nems fe vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: NEMS_FE_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -450,6 +836,17 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - SG_ECA_MGMT
+ - eca_oam
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: mmsc_security_group_1
@@ -457,6 +854,14 @@ topology_template:
label: nems_traffic_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_traffic_net_ips
type: list
description: nems_traffic_net IPs for NEMS_FE
default:
@@ -468,6 +873,14 @@ topology_template:
label: nems imap start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_start
type: string
description: nems imap start
default: 172.26.7.3
@@ -475,6 +888,14 @@ topology_template:
label: ha_failover network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_name
type: string
description: ha_failover network name
default: int_mms_ha_net_2
@@ -482,6 +903,14 @@ topology_template:
label: arbiter server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: arb_names
type: list
description: the names of the arbiter VM instances
default:
@@ -491,6 +920,14 @@ topology_template:
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
default: m1.large
@@ -498,6 +935,14 @@ topology_template:
label: oam1 oam gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: eca_oam_gateway
type: string
description: the ip of oam gateway
default: 107.250.172.1
@@ -505,6 +950,14 @@ topology_template:
label: eca traffic start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_start
type: string
description: eca traffic start
default: 172.26.5.3
@@ -512,6 +965,14 @@ topology_template:
label: nems be vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: NEMS_BE_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -519,6 +980,14 @@ topology_template:
label: MMSC load balancer image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_image_name
type: string
description: MMSC load balancer image name
default: BIGIP-11.5.3.0.0.163
@@ -526,6 +995,14 @@ topology_template:
label: nems internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_start
type: string
description: nems internal start
default: 172.26.6.3
@@ -533,6 +1010,14 @@ topology_template:
label: nems internal gw
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_gateway
type: string
description: nems internal gw
default: 172.26.6.1
@@ -540,6 +1025,14 @@ topology_template:
label: oam network ips for arb VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: arb_oam_ips
type: list
description: oam network ips for eca VM
default:
@@ -550,6 +1043,14 @@ topology_template:
label: UID of dmz_protected network
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: dmz_protected_net_name
type: string
description: UID of dmz_protected network
default: dmz_protected_net_0
@@ -557,6 +1058,14 @@ topology_template:
label: nems be volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_volume_size
type: float
description: nems be volume size
default: 610
@@ -564,6 +1073,14 @@ topology_template:
label: MMS traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_netmask
type: string
description: MMS traffic network subnet mask
default: 255.255.255.0
@@ -571,6 +1088,14 @@ topology_template:
label: Image for NEMS BE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_image
type: string
description: Image for NEMS BE server
default: nems-2.1.2_v29
@@ -578,6 +1103,14 @@ topology_template:
label: nems user web network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_local_ip1
type: string
description: the local ip1 of the nems user web network
default: 172.26.4.3
@@ -585,6 +1118,14 @@ topology_template:
label: eca mgmt net IP for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_mgmt_ips
type: list
description: eca mgmt net IP for ECA_TRX
default:
@@ -614,6 +1155,14 @@ topology_template:
label: nems user web cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_cidr
type: string
description: nems user web cidr
default: 172.26.4.0/24
@@ -621,6 +1170,14 @@ topology_template:
label: nems user web network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_local_ip2
type: string
description: the local ip2 of the nems user web network
default: 172.26.4.4
@@ -628,6 +1185,14 @@ topology_template:
label: NEMS traffic network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_gateway
type: string
description: NEMS traffic network gateway
default: 172.26.3.1
@@ -635,6 +1200,14 @@ topology_template:
label: nems imap name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_name
type: string
description: nems imap name
default: int_mms_nems_imap_net_2
@@ -642,6 +1215,14 @@ topology_template:
label: mmsc traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_floating_ip
type: string
description: mmsc traffic floating ip
default: 172.26.2.5
@@ -649,6 +1230,14 @@ topology_template:
label: NEMS internal network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_netmask
type: string
description: NEMS internal network subnet mask
default: 255.255.255.0
@@ -656,6 +1245,14 @@ topology_template:
label: NEMS user web network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_netmask
type: string
description: NEMS user web network subnet mask
default: 255.255.255.0
@@ -663,6 +1260,14 @@ topology_template:
label: mmsc traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_local_ip1
type: string
description: the local ip1 of the mmsc traffic network
default: 172.26.2.3
@@ -670,6 +1275,14 @@ topology_template:
label: mmsc traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_local_ip2
type: string
description: the local ip2 of the mmsc traffic network
default: 172.26.2.4
@@ -677,12 +1290,30 @@ topology_template:
label: image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: the OAM image name
default: ECABASE
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - eca_oam
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
default: oam_protected_net_0
@@ -690,6 +1321,15 @@ topology_template:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
default: 155.165.194.100
@@ -697,6 +1337,14 @@ topology_template:
label: MMS traffic network address (CIDR notation)
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_cidr
type: string
description: MMS traffic network address (CIDR notation)
default: 172.26.2.0/24
@@ -704,6 +1352,14 @@ topology_template:
label: dmz protected network local ips for lb VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_dmz_protected_ips
type: list
description: local ips of the dmz protected network for lb VM
default:
@@ -715,6 +1371,14 @@ topology_template:
label: eca management start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_start
type: string
description: eca management start
default: 172.25.137.195
@@ -722,6 +1386,14 @@ topology_template:
label: oam network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: eca_oam_ips
type: list
description: the ips of oam networks for eca VM
default:
@@ -733,6 +1405,14 @@ topology_template:
label: MMSC vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: MMSC_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -740,6 +1420,14 @@ topology_template:
label: Flavor for NEMS FE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_flavor
type: string
description: Flavor for NEMS FE server
default: m1.large2
@@ -747,6 +1435,14 @@ topology_template:
label: ECA mgmt network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_netmask
type: string
description: ECA mgmt network subnet mask
default: 255.255.255.192
@@ -754,6 +1450,15 @@ topology_template:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
default: 255.255.255.192
@@ -761,6 +1466,14 @@ topology_template:
label: oam network route 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_route_1
type: string
description: oam network route 1
default: 155.165.201.250/32,107.250.172.1
@@ -768,6 +1481,14 @@ topology_template:
label: oam network route 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_route_2
type: string
description: oam network route 2
default: 155.165.194.100/32,107.250.172.1
@@ -775,6 +1496,14 @@ topology_template:
label: Name of MMS traffic network
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_name
type: string
description: Name of MMS traffic network
default: int_mms_mms_traffic_net_2
@@ -782,6 +1511,14 @@ topology_template:
label: nems user web name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_name
type: string
description: nems user web name
default: int_mms_nems_web_net_2
@@ -789,6 +1526,14 @@ topology_template:
label: eca traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_floating_ip
type: string
description: eca traffic floating ip
default: 172.26.5.5
@@ -796,6 +1541,14 @@ topology_template:
label: eca traffic end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_end
type: string
description: eca traffic end
default: 172.26.5.254
@@ -803,6 +1556,14 @@ topology_template:
label: Flavor for ECA TRX server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_flavor
type: string
description: Flavor for ECA TRX server
default: m1.xlarge
@@ -810,6 +1571,14 @@ topology_template:
label: management network ips for mmsc lb
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_oam_ips
type: list
description: the ips of the management network for mmsc lb
default:
@@ -821,6 +1590,14 @@ topology_template:
label: OAM_net IP for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_oam_ips
type: list
description: OAM_net IP for NEMS_FE
default:
@@ -832,6 +1609,14 @@ topology_template:
label: Flavor for NEMS BE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_flavor
type: string
description: Flavor for NEMS BE server
default: m1.large2
@@ -839,6 +1624,14 @@ topology_template:
label: cor direct network local ips for lb VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_cor_direct_ips
type: list
description: local ips of cor direct network for lb VM
default:
@@ -850,6 +1643,14 @@ topology_template:
label: nems traffic name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: nems traffic name
default: int_mms_nems_traffic_net_2
@@ -857,6 +1658,15 @@ topology_template:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
default: UTC
@@ -864,6 +1674,14 @@ topology_template:
label: flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: oam_flavor
type: string
description: OAM flavor name
default: lc.xlarge4
@@ -871,6 +1689,14 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
default: 55
@@ -878,6 +1704,14 @@ topology_template:
label: nems user web start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_start
type: string
description: nems user web end
default: 172.26.4.3
@@ -885,6 +1719,14 @@ topology_template:
label: eca_mgmt network ips for eca VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: eca_eca_mgmt_ips
type: list
description: internal eca_mgmt network ips for eca VM
default:
@@ -896,6 +1738,14 @@ topology_template:
label: MMSC server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_names
type: list
description: MMSC server names
default:
@@ -910,6 +1760,15 @@ topology_template:
label: internal network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_mgmt_net_name
type: string
description: the name of the internal network
default: int_mms_eca_mgmt_net_1
@@ -917,6 +1776,14 @@ topology_template:
label: eca traffic name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_name
type: string
description: eca traffic name
default: int_mms_eca_traffic_net_2
@@ -924,6 +1791,14 @@ topology_template:
label: nems internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_end
type: string
description: nems internal end
default: 172.26.6.254
@@ -931,6 +1806,14 @@ topology_template:
label: nems internal net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_nems_internal_net_ips
type: string
description: nems internal net IPs for NEMS_BE
default: 172.26.6.13
@@ -938,6 +1821,14 @@ topology_template:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: arb_volume_size
type: float
description: the size of the ARB volume
default: 40
@@ -945,6 +1836,14 @@ topology_template:
label: mmsc dmz_protected virtual server ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_dmz_protected_virtual_server_ips
type: list
description: mmsc dmz_protected virtual server ips
default:
@@ -957,12 +1856,30 @@ topology_template:
label: cor direct net UID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: cor_direct_net_name
type: string
description: cor direct net
default: cor_direct_net_0
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - eca_oam
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
@@ -970,6 +1887,15 @@ topology_template:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
default: 10.20.30.1
@@ -977,6 +1903,14 @@ topology_template:
label: Flavor for MMSC server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_flavor
type: string
description: Flavor for MMSC server
default: lc.4xlarge4
@@ -984,6 +1918,14 @@ topology_template:
label: ha net end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_end
type: string
description: ha net end
default: 172.26.1.254
@@ -991,6 +1933,14 @@ topology_template:
label: nems imap subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_netmask
type: string
description: nems imap subnet mask
default: 255.255.255.0
@@ -998,6 +1948,15 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
default: 155.165.201.250
@@ -1005,6 +1964,14 @@ topology_template:
label: Swift URL
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: swift_eca_url
type: string
description: Base URL for eca swift object store
default: http://object-store.rdm2.cci.com:8080/v1/AUTH_1bbab536a19b4756926e7d0ec1eb543c/eca
@@ -1012,6 +1979,14 @@ topology_template:
label: eca_traffic network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_gateway
type: string
description: eca_traffic network gateway
default: 172.26.5.1
@@ -1019,6 +1994,14 @@ topology_template:
label: OAM net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_oam_ips
type: string
description: OAM net IPs for NEMS_BE
default: 107.250.172.66
@@ -1026,6 +2009,14 @@ topology_template:
label: OAM net IP for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_oam_ips
type: list
description: OAM net IP for ECA_TRX
default:
@@ -1055,6 +2046,14 @@ topology_template:
label: Image for MMSC server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_image
type: string
description: Image for MMSC server
default: mmsc-6.0.2_v5
@@ -1062,6 +2061,14 @@ topology_template:
label: flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - eca_oam
+ source_type: HEAT
+ param_name: arbiter_flavor
type: string
description: arbiter flavor name
default: m1.large2
@@ -1069,6 +2076,14 @@ topology_template:
label: nems imap cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_cidr
type: string
description: nems imap cidr
default: 172.26.7.0/24
@@ -1076,6 +2091,14 @@ topology_template:
label: ECA traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_netmask
type: string
description: ECA traffic network subnet mask
default: 255.255.255.0
@@ -1083,6 +2106,14 @@ topology_template:
label: nems fe node roles
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_node_roles
type: list
description: nems fe node roles
default:
@@ -1094,6 +2125,14 @@ topology_template:
label: MMSC mms_traffic_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_mms_traffic_net_ips
type: list
description: MMSC mms_traffic_net IP addresses
default:
@@ -1108,6 +2147,14 @@ topology_template:
label: nems traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_floating_ip
type: string
description: nems traffic floating ip
default: 172.26.3.5
@@ -1115,6 +2162,14 @@ topology_template:
label: MMS traffic network gateway address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_gateway
type: string
description: MMS traffic network gateway address
default: 172.26.2.1
@@ -1122,6 +2177,14 @@ topology_template:
label: Image for NEMS FE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_image
type: string
description: Image for NEMS FE server
default: nems-2.1.2_v29
@@ -1129,6 +2192,14 @@ topology_template:
label: MMSC oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_oam_ips
type: list
description: MMSC oam_net IP addresses
default:
@@ -1143,6 +2214,14 @@ topology_template:
label: eca management name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_name
type: string
description: eca management name
default: int_eca_mgmt_net_1
@@ -1150,6 +2229,14 @@ topology_template:
label: nems traffic cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_cidr
type: string
description: nems traffic cidr
default: 172.26.3.0/24
@@ -1157,6 +2244,14 @@ topology_template:
label: nems node roles
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_node_roles
type: string
description: nems node roles
default: BE0
@@ -1164,6 +2259,14 @@ topology_template:
label: mmsc core snat ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_core_snat_ips
type: list
description: mmsc core snat ips
default:
@@ -1178,6 +2281,14 @@ topology_template:
label: nems user web floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_floating_ip
type: string
description: nems user web floating ip
default: 172.26.4.5
@@ -5516,4 +6627,4 @@ topology_template:
HOT template that creates Security Group and ECA network
members:
- mms_security_group
- - eca_mgmt_net \ No newline at end of file
+ - eca_mgmt_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
index c59a175a47..9fcd17b5a0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml
@@ -25,6 +25,14 @@ topology_template:
label: Load balancer flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_flavor_name
type: string
description: the flavor name of MMSC load balancer instance
default: m1.xlarge
@@ -32,6 +40,14 @@ topology_template:
label: ha net network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_local_ip2
type: string
description: the local ip2 of the ha network
default: 172.26.1.4
@@ -39,6 +55,14 @@ topology_template:
label: mmsc dmz_protected snat ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_dmz_protected_snat_ips
type: list
description: mmsc dmz_protected snat ips
default:
@@ -52,6 +76,14 @@ topology_template:
label: ha net network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_local_ip1
type: string
description: the local ip1 of the ha network
default: 172.26.1.3
@@ -59,6 +91,14 @@ topology_template:
label: mmsc traffic end IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_end
type: string
description: mmsc traffic end IP
default: 172.26.2.254
@@ -66,6 +106,14 @@ topology_template:
label: nems traffic end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_end
type: string
description: nems traffic end
default: 172.26.3.254
@@ -73,6 +121,14 @@ topology_template:
label: MMSC Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_cinder_volume_size
type: float
description: the size of the MMSC Cinder volume
default: 480
@@ -80,6 +136,14 @@ topology_template:
label: nems ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_cidr
type: string
description: nems internal cidr
default: 172.26.6.0/24
@@ -87,6 +151,14 @@ topology_template:
label: eca management cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_cidr
type: string
description: eca management cidr
default: 172.25.137.192/26
@@ -94,6 +166,14 @@ topology_template:
label: nems traffic start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_start
type: string
description: nems traffic start
default: 172.26.3.3
@@ -101,6 +181,14 @@ topology_template:
label: ECA_TRX server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_names
type: list
description: ECA_TRX server names
default:
@@ -130,6 +218,14 @@ topology_template:
label: nems internal network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_name
type: string
description: nems internal network name
default: int_mms_nems_internal_net_2
@@ -137,6 +233,14 @@ topology_template:
label: nems traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_local_ip1
type: string
description: the local ip1 of the nems traffic network
default: 172.26.3.3
@@ -144,6 +248,14 @@ topology_template:
label: nems traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_local_ip2
type: string
description: the local ip2 of the nems traffic network
default: 172.26.3.4
@@ -151,6 +263,14 @@ topology_template:
label: NEMS_FE server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_names
type: list
description: NEMS_FE server names
default:
@@ -162,6 +282,14 @@ topology_template:
label: nems imap_net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_nems_imap_net_ips
type: string
description: nems imap net IPs for NEMS_BE
default: 172.26.7.13
@@ -169,6 +297,14 @@ topology_template:
label: NEMS_BE server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_names
type: string
description: NEMS_BE server names
default: ZRDM1MMSC03NBE001
@@ -176,6 +312,14 @@ topology_template:
label: NEMS traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_netmask
type: string
description: NEMS traffic network subnet mask
default: 255.255.255.0
@@ -183,6 +327,14 @@ topology_template:
label: nems_imap_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_imap_net_ips
type: list
description: nems_imap_net IPs for NEMS_FE
default:
@@ -194,6 +346,14 @@ topology_template:
label: nems_web_user_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_user_web_net_ips
type: list
description: nems_web_user_net IPs for NEMS_FE
default:
@@ -205,6 +365,14 @@ topology_template:
label: NEMS user web network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_gateway
type: string
description: NEMS user web network gateway
default: 172.26.4.1
@@ -212,6 +380,14 @@ topology_template:
label: nems imap end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_end
type: string
description: nems imap end
default: 172.26.7.254
@@ -219,12 +395,28 @@ topology_template:
label: eca traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_local_ip1
type: string
description: the local ip1 of the eca traffic network
default: 172.26.5.3
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
default: cmaui-5.0.2.5_v25
@@ -232,6 +424,14 @@ topology_template:
label: eca traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_local_ip2
type: string
description: the local ip2 of the eca traffic network
default: 172.26.5.4
@@ -239,6 +439,14 @@ topology_template:
label: nems fe volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_volume_size
type: float
description: nems fe volume size
default: 50
@@ -246,6 +454,14 @@ topology_template:
label: mmsc traffic start IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_start
type: string
description: mmsc traffic start IP
default: 172.26.2.3
@@ -253,6 +469,14 @@ topology_template:
label: ha net start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_start
type: string
description: ha net start
default: 172.26.1.3
@@ -260,6 +484,14 @@ topology_template:
label: nems imap gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_gateway
type: string
description: nems imap gateway
default: 172.26.7.1
@@ -267,6 +499,14 @@ topology_template:
label: mmsc core virtual server ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_core_virtual_server_ips
type: list
description: mmsc core virtual server ips
default:
@@ -278,6 +518,14 @@ topology_template:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
default:
@@ -289,12 +537,28 @@ topology_template:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
default: Platinum
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
default:
@@ -306,6 +570,14 @@ topology_template:
label: eca traffic net IPs for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_eca_traffic_net_ips
type: list
description: eca traffic net IPs for ECA_TRX
default:
@@ -335,6 +607,14 @@ topology_template:
label: Image for ECA TRX server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_image
type: string
description: Image for ECA TRX server
default: ECABASE
@@ -342,6 +622,14 @@ topology_template:
label: MMSC load balancer instance names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_names
type: list
description: MMSC load balancer instance names
default:
@@ -353,6 +641,14 @@ topology_template:
label: eca management end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_end
type: string
description: eca management end
default: 172.25.137.254
@@ -360,6 +656,14 @@ topology_template:
label: nems user web end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_end
type: string
description: nems user web end
default: 172.26.4.254
@@ -367,6 +671,14 @@ topology_template:
label: eca traffic cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_cidr
type: string
description: eca traffic cidr
default: 172.26.5.0/24
@@ -374,6 +686,14 @@ topology_template:
label: ha net cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_cidr
type: string
description: ha net cidr
default: 172.26.1.0/24
@@ -381,6 +701,15 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
default: nova
@@ -388,6 +717,14 @@ topology_template:
label: nems_internal_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_internal_net_ips
type: list
description: nems_internal_net IPs for NEMS_FE
default:
@@ -399,6 +736,14 @@ topology_template:
label: nems fe vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: NEMS_FE_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -406,6 +751,16 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - SG_ECA_MGMT
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: mmsc_security_group_1
@@ -413,6 +768,14 @@ topology_template:
label: nems_traffic_net IPs for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_nems_traffic_net_ips
type: list
description: nems_traffic_net IPs for NEMS_FE
default:
@@ -424,6 +787,14 @@ topology_template:
label: nems imap start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_start
type: string
description: nems imap start
default: 172.26.7.3
@@ -431,12 +802,28 @@ topology_template:
label: ha_failover network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_name
type: string
description: ha_failover network name
default: int_mms_ha_net_2
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
default: m1.large
@@ -444,6 +831,14 @@ topology_template:
label: eca traffic start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_start
type: string
description: eca traffic start
default: 172.26.5.3
@@ -451,6 +846,14 @@ topology_template:
label: nems be vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: NEMS_BE_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -458,6 +861,14 @@ topology_template:
label: MMSC load balancer image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_image_name
type: string
description: MMSC load balancer image name
default: BIGIP-11.5.3.0.0.163
@@ -465,6 +876,14 @@ topology_template:
label: nems internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_start
type: string
description: nems internal start
default: 172.26.6.3
@@ -472,6 +891,14 @@ topology_template:
label: nems internal gw
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_gateway
type: string
description: nems internal gw
default: 172.26.6.1
@@ -479,6 +906,14 @@ topology_template:
label: UID of dmz_protected network
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: dmz_protected_net_name
type: string
description: UID of dmz_protected network
default: dmz_protected_net_0
@@ -486,6 +921,14 @@ topology_template:
label: nems be volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_volume_size
type: float
description: nems be volume size
default: 610
@@ -493,6 +936,14 @@ topology_template:
label: MMS traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_netmask
type: string
description: MMS traffic network subnet mask
default: 255.255.255.0
@@ -500,6 +951,14 @@ topology_template:
label: Image for NEMS BE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_image
type: string
description: Image for NEMS BE server
default: nems-2.1.2_v29
@@ -507,6 +966,14 @@ topology_template:
label: nems user web network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_local_ip1
type: string
description: the local ip1 of the nems user web network
default: 172.26.4.3
@@ -514,6 +981,14 @@ topology_template:
label: eca mgmt net IP for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_mgmt_ips
type: list
description: eca mgmt net IP for ECA_TRX
default:
@@ -543,6 +1018,14 @@ topology_template:
label: nems user web cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_cidr
type: string
description: nems user web cidr
default: 172.26.4.0/24
@@ -550,6 +1033,14 @@ topology_template:
label: nems user web network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_local_ip2
type: string
description: the local ip2 of the nems user web network
default: 172.26.4.4
@@ -557,6 +1048,14 @@ topology_template:
label: NEMS traffic network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_gateway
type: string
description: NEMS traffic network gateway
default: 172.26.3.1
@@ -564,6 +1063,14 @@ topology_template:
label: nems imap name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_name
type: string
description: nems imap name
default: int_mms_nems_imap_net_2
@@ -571,6 +1078,14 @@ topology_template:
label: mmsc traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_floating_ip
type: string
description: mmsc traffic floating ip
default: 172.26.2.5
@@ -578,6 +1093,14 @@ topology_template:
label: NEMS internal network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_netmask
type: string
description: NEMS internal network subnet mask
default: 255.255.255.0
@@ -585,6 +1108,14 @@ topology_template:
label: NEMS user web network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_netmask
type: string
description: NEMS user web network subnet mask
default: 255.255.255.0
@@ -592,6 +1123,14 @@ topology_template:
label: mmsc traffic network local ip1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_local_ip1
type: string
description: the local ip1 of the mmsc traffic network
default: 172.26.2.3
@@ -599,12 +1138,29 @@ topology_template:
label: mmsc traffic network local ip2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_local_ip2
type: string
description: the local ip2 of the mmsc traffic network
default: 172.26.2.4
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
default: oam_protected_net_0
@@ -612,6 +1168,15 @@ topology_template:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
default: 155.165.194.100
@@ -619,6 +1184,14 @@ topology_template:
label: MMS traffic network address (CIDR notation)
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_cidr
type: string
description: MMS traffic network address (CIDR notation)
default: 172.26.2.0/24
@@ -626,6 +1199,14 @@ topology_template:
label: dmz protected network local ips for lb VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_dmz_protected_ips
type: list
description: local ips of the dmz protected network for lb VM
default:
@@ -637,6 +1218,14 @@ topology_template:
label: eca management start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_start
type: string
description: eca management start
default: 172.25.137.195
@@ -644,6 +1233,14 @@ topology_template:
label: MMSC vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: MMSC_volume_type
type: string
description: the name of the target volume backend
default: Platinum
@@ -651,6 +1248,14 @@ topology_template:
label: Flavor for NEMS FE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_flavor
type: string
description: Flavor for NEMS FE server
default: m1.large2
@@ -658,6 +1263,14 @@ topology_template:
label: ECA mgmt network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_netmask
type: string
description: ECA mgmt network subnet mask
default: 255.255.255.192
@@ -665,6 +1278,15 @@ topology_template:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
default: 255.255.255.192
@@ -672,6 +1294,14 @@ topology_template:
label: oam network route 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_route_1
type: string
description: oam network route 1
default: 155.165.201.250/32,107.250.172.1
@@ -679,6 +1309,14 @@ topology_template:
label: oam network route 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_route_2
type: string
description: oam network route 2
default: 155.165.194.100/32,107.250.172.1
@@ -686,6 +1324,14 @@ topology_template:
label: Name of MMS traffic network
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_name
type: string
description: Name of MMS traffic network
default: int_mms_mms_traffic_net_2
@@ -693,6 +1339,14 @@ topology_template:
label: nems user web name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_name
type: string
description: nems user web name
default: int_mms_nems_web_net_2
@@ -700,6 +1354,14 @@ topology_template:
label: eca traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_floating_ip
type: string
description: eca traffic floating ip
default: 172.26.5.5
@@ -707,6 +1369,14 @@ topology_template:
label: eca traffic end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_end
type: string
description: eca traffic end
default: 172.26.5.254
@@ -714,6 +1384,14 @@ topology_template:
label: Flavor for ECA TRX server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_flavor
type: string
description: Flavor for ECA TRX server
default: m1.xlarge
@@ -721,6 +1399,14 @@ topology_template:
label: management network ips for mmsc lb
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_oam_ips
type: list
description: the ips of the management network for mmsc lb
default:
@@ -732,6 +1418,14 @@ topology_template:
label: OAM_net IP for NEMS_FE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_oam_ips
type: list
description: OAM_net IP for NEMS_FE
default:
@@ -743,6 +1437,14 @@ topology_template:
label: Flavor for NEMS BE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_flavor
type: string
description: Flavor for NEMS BE server
default: m1.large2
@@ -750,6 +1452,14 @@ topology_template:
label: cor direct network local ips for lb VM
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: lb_cor_direct_ips
type: list
description: local ips of cor direct network for lb VM
default:
@@ -761,6 +1471,14 @@ topology_template:
label: nems traffic name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: nems traffic name
default: int_mms_nems_traffic_net_2
@@ -768,6 +1486,15 @@ topology_template:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
default: UTC
@@ -775,6 +1502,14 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
default: 55
@@ -782,6 +1517,14 @@ topology_template:
label: nems user web start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_start
type: string
description: nems user web end
default: 172.26.4.3
@@ -789,6 +1532,14 @@ topology_template:
label: MMSC server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_names
type: list
description: MMSC server names
default:
@@ -803,6 +1554,14 @@ topology_template:
label: eca management network ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_mgmt_net_name
type: string
description: Network ID for eca management
default: int_eca_mgmt_net_1
@@ -810,6 +1569,14 @@ topology_template:
label: eca traffic name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_name
type: string
description: eca traffic name
default: int_mms_eca_traffic_net_2
@@ -817,6 +1584,14 @@ topology_template:
label: nems internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_internal_end
type: string
description: nems internal end
default: 172.26.6.254
@@ -824,6 +1599,14 @@ topology_template:
label: nems internal net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_nems_internal_net_ips
type: string
description: nems internal net IPs for NEMS_BE
default: 172.26.6.13
@@ -831,6 +1614,14 @@ topology_template:
label: mmsc dmz_protected virtual server ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_dmz_protected_virtual_server_ips
type: list
description: mmsc dmz_protected virtual server ips
default:
@@ -843,12 +1634,29 @@ topology_template:
label: cor direct net UID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: cor_direct_net_name
type: string
description: cor direct net
default: cor_direct_net_0
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
@@ -856,6 +1664,15 @@ topology_template:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
default: 10.20.30.1
@@ -863,6 +1680,14 @@ topology_template:
label: Flavor for MMSC server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_flavor
type: string
description: Flavor for MMSC server
default: lc.4xlarge4
@@ -870,6 +1695,14 @@ topology_template:
label: ha net end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: ha_net_end
type: string
description: ha net end
default: 172.26.1.254
@@ -877,6 +1710,14 @@ topology_template:
label: nems imap subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_netmask
type: string
description: nems imap subnet mask
default: 255.255.255.0
@@ -884,6 +1725,15 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - cmaui
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
default: 155.165.201.250
@@ -891,6 +1741,14 @@ topology_template:
label: eca_traffic network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_net_gateway
type: string
description: eca_traffic network gateway
default: 172.26.5.1
@@ -898,6 +1756,14 @@ topology_template:
label: OAM net IPs for NEMS_BE
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_oam_ips
type: string
description: OAM net IPs for NEMS_BE
default: 107.250.172.66
@@ -905,6 +1771,14 @@ topology_template:
label: OAM net IP for ECA_TRX
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_trx_oam_ips
type: list
description: OAM net IP for ECA_TRX
default:
@@ -934,6 +1808,14 @@ topology_template:
label: Image for MMSC server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_image
type: string
description: Image for MMSC server
default: mmsc-6.0.2_v5
@@ -941,6 +1823,14 @@ topology_template:
label: nems imap cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_imap_cidr
type: string
description: nems imap cidr
default: 172.26.7.0/24
@@ -948,6 +1838,14 @@ topology_template:
label: ECA traffic network subnet mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: eca_traffic_netmask
type: string
description: ECA traffic network subnet mask
default: 255.255.255.0
@@ -955,6 +1853,14 @@ topology_template:
label: nems fe node roles
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_node_roles
type: list
description: nems fe node roles
default:
@@ -966,6 +1872,14 @@ topology_template:
label: MMSC mms_traffic_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_mms_traffic_net_ips
type: list
description: MMSC mms_traffic_net IP addresses
default:
@@ -980,6 +1894,14 @@ topology_template:
label: nems traffic floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_net_floating_ip
type: string
description: nems traffic floating ip
default: 172.26.3.5
@@ -987,6 +1909,14 @@ topology_template:
label: MMS traffic network gateway address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mms_traffic_net_gateway
type: string
description: MMS traffic network gateway address
default: 172.26.2.1
@@ -994,6 +1924,14 @@ topology_template:
label: Image for NEMS FE server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_fe_image
type: string
description: Image for NEMS FE server
default: nems-2.1.2_v29
@@ -1001,6 +1939,14 @@ topology_template:
label: MMSC oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_oam_ips
type: list
description: MMSC oam_net IP addresses
default:
@@ -1015,6 +1961,14 @@ topology_template:
label: eca management name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - SG_ECA_MGMT
+ source_type: HEAT
+ param_name: eca_mgmt_name
type: string
description: eca management name
default: int_eca_mgmt_net_1
@@ -1022,6 +1976,14 @@ topology_template:
label: nems traffic cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_traffic_cidr
type: string
description: nems traffic cidr
default: 172.26.3.0/24
@@ -1029,6 +1991,14 @@ topology_template:
label: nems node roles
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_be_node_roles
type: string
description: nems node roles
default: BE0
@@ -1036,6 +2006,14 @@ topology_template:
label: mmsc core snat ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: mmsc_core_snat_ips
type: list
description: mmsc core snat ips
default:
@@ -1050,6 +2028,14 @@ topology_template:
label: nems user web floating ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - MMSC_Capacity_Line
+ source_type: HEAT
+ param_name: nems_user_web_net_floating_ip
type: string
description: nems user web floating ip
default: 172.26.4.5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_MultiPolicy_single_net_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_MultiPolicy_single_net_translation/expectedoutputfiles/MainServiceTemplate.yaml
index 664d0eb8f8..97558ea3ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_MultiPolicy_single_net_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_MultiPolicy_single_net_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,99 +9,267 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
type: string
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -278,4 +446,4 @@ topology_template:
- template_VirtualNetwork_2
- template_NetworkPolicy_1
- template_NetworkPolicy_3
- - template_NetworkPolicy_2 \ No newline at end of file
+ - template_NetworkPolicy_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_Multi_net_single_policy_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_Multi_net_single_policy_translation/expectedoutputfiles/MainServiceTemplate.yaml
index 5f3717475e..ee6719582a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_Multi_net_single_policy_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/ContrailV2_Multi_net_single_policy_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,99 +9,267 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
type: string
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -264,4 +432,4 @@ topology_template:
- template_NetworkPolicy
- template_VirtualNetwork_2
- template_VirtualNetwork_1
- - template_VirtualNetwork_3 \ No newline at end of file
+ - template_VirtualNetwork_3
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/invalid_policy_resource_type/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/invalid_policy_resource_type/expectedoutputfiles/MainServiceTemplate.yaml
index 39aee3c4fa..b8f9ee5133 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/invalid_policy_resource_type/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/invalid_policy_resource_type/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,99 +9,267 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
type: string
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -166,4 +334,4 @@ topology_template:
description: cmaui server template for vMMSC
members:
- template_NetworkPolicy
- - template_VirtualNetwork_2 \ No newline at end of file
+ - template_VirtualNetwork_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/simple/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/simple/expectedoutputfiles/MainServiceTemplate.yaml
index d31efa8e4c..bf6571dd35 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/simple/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/ContrailV2_translation/simple/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,99 +9,267 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
type: string
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -198,4 +366,4 @@ topology_template:
description: cmaui server template for vMMSC
members:
- template_NetworkPolicy
- - template_VirtualNetwork_2 \ No newline at end of file
+ - template_VirtualNetwork_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
index 121b2d9c8b..bfc7ec481a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ 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:
@@ -54,4 +62,4 @@ topology_template:
members:
- test_net1
- test_net
- - test_nested \ No newline at end of file
+ - test_nested
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 6d883f24cd..0fd3d769b3 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
@@ -11,12 +11,28 @@ topology_template:
untrusted_vlan_networks:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: untrusted_vlan_networks
type: list
entry_schema:
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 log network
node_templates:
@@ -52,4 +68,4 @@ topology_template:
members:
- test_net1
- test_net
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index a14b9d2c59..b92ec2561b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,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:
@@ -153,4 +177,4 @@ topology_template:
- test_net
- test_nestedInvalidConnectionToNetwork1
- test_contrail_net
- - test_nova \ No newline at end of file
+ - test_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index 2cf0580cc7..f7ec793cd8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,16 +11,40 @@ 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:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
node_templates:
@@ -125,4 +149,4 @@ topology_template:
members:
- test_nested2
- test_nested3
- - test_nested1 \ 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/VMInterfaceToNettworkConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index 354559b3aa..cbaf2ce680 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
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:
@@ -19,23 +27,63 @@ 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
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:
@@ -43,31 +91,79 @@ 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
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
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:
@@ -76,11 +172,27 @@ topology_template:
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
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:
@@ -185,4 +297,4 @@ topology_template:
- template_VMInt_OAM_lb_1
- template_VMInt_OAM_lb_2
- template_VMInt_OAM_lb_3
- - server_cmaui \ No newline at end of file
+ - server_cmaui
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 297a958256..06eef6ae49 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,32 +14,89 @@ topology_template:
shared_test_nova:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_nova
type: string
shared_test_contrail_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_contrail_net
type: string
contrail_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: contrail_net_name
type: string
description: network name of jsa log network
shared_test_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_net
type: string
shared_test_contrailV2_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_contrailV2_net
type: string
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
jsa_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: jsa_name
type: string
node_templates:
test_nested1Level:
@@ -173,4 +230,4 @@ topology_template:
- test_nested1Level
- test_resourceGroup
- test_nestedInvalidConnectionToNetwork2
- - test_nestedInvalidConnectionToNetwork1 \ No newline at end of file
+ - test_nestedInvalidConnectionToNetwork1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
index 3e001149b5..2ffe57da05 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -20,58 +28,138 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
availability_zone_0:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -80,23 +168,55 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -185,4 +305,4 @@ topology_template:
- server_dependOnString
- server_cmaui
- cmaui_volume
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
index 6ac9fbc822..05c19de84c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,106 +14,274 @@ topology_template:
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -216,4 +384,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/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
index bbefd39756..1410f714de 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -182,4 +350,4 @@ topology_template:
- QRouter
- 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/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
index 11e0c062c6..6e00f44eea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -13,36 +13,84 @@ topology_template:
label: PD flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ 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:
+ - input
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
oam_flavor_name:
label: OAM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: flavor name of OAM instance
pd_image_name:
label: image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: pd_image_name
type: string
description: PD image name
packet_mirror_network_name:
label: packet mirror network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ 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:
+ - input
+ source_type: HEAT
+ param_name: pd_server_names
type: list
description: name of the PD instance
entry_schema:
@@ -51,6 +99,14 @@ topology_template:
label: oam network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: name of the oam network
node_templates:
@@ -128,4 +184,4 @@ topology_template:
- pd01_port_0
- resources_with_dependOn
- pd02_port_0
- - server_pd_01 \ No newline at end of file
+ - server_pd_01
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
index 38fd7be3d8..32d1f50c82 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -192,4 +360,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/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
index 248998d69e..7b75e051f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -191,4 +359,4 @@ topology_template:
- QRouter
- 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/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
index 54c47ee20f..4e45d6ca2c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,31 +12,79 @@ topology_template:
MASTER_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: MASTER_image_name
type: string
description: JSA MASTER instance image name
MASTER_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: MASTER_names
type: string
description: JSA MASTER instance name
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: security group name of JSA
MASTER_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: MASTER_flavor_name
type: string
description: the flavor name of JSA MASTER instance
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: network name of OAM network
node_templates:
@@ -124,4 +172,4 @@ topology_template:
- packet_internal_network
- MASTER_mgmt_port_2
- MASTER_mgmt_port
- - MASTER_instance \ No newline at end of file
+ - MASTER_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
index a57daa2f56..7e0ac24cc7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,106 +12,274 @@ topology_template:
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - input
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -191,4 +359,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/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
index a9ad3c770e..2bef1f9219 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/cinder_volume_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -10,42 +10,98 @@ topology_template:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
stam:
label: stam
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: stam
type: float
description: stam
FSB_2_image:
label: MME_FSB2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: FSB_2_image
type: string
description: MME_FSB2_15B-CP04-r5a01
FSB2_volume_name:
label: FSB2_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: FSB2_volume_name
type: string
description: FSB2_volume_1
node_templates:
@@ -104,4 +160,4 @@ topology_template:
- FSB1_volume
- FSB2_volume
- FSB3_volume
- - FSB4_volume \ No newline at end of file
+ - FSB4_volume
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
index 8e8e4f9abe..a228e6d892 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,26 +11,74 @@ topology_template:
Internal1_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
Internal1_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
Internal2_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_net_name
type: string
Internal2_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
Internal2_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
Internal1_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
node_templates:
Internal2-net:
@@ -130,4 +178,4 @@ topology_template:
members:
- Internal2-net
- Internal1-net
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
index f74dda879b..0d104cb622 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkSharedMultiNested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,26 +11,80 @@ topology_template:
Internal1_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
Internal1_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
Internal2_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal2_net_name
type: string
Internal2_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
Internal2_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
Internal1_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
node_templates:
Internal2-net:
@@ -227,4 +281,4 @@ topology_template:
members:
- Internal1-net-1
- test_nested1
- - Internal2-net-1 \ No newline at end of file
+ - Internal2-net-1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
index b663dca29a..9482138b50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/diffServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,146 +11,386 @@ topology_template:
service_policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_name
type: string
description: Policy Name
st_static_routes_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_static_routes_list
type: string
description: List of static routes enabled-disabled
st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_type
type: string
description: service type
st_service_interface_type_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_service_interface_type_list
type: string
description: List of interface types
st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_mode
type: string
description: service mode
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Name of Cricket OCS network
oam_mgmt_net_0_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: oam_mgmt_net_0_id
type: string
description: Name of OAM network
start_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_dst_ports
type: float
description: Start of dst port
st_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_flavor
type: string
description: Flavor
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: availability zone
service_instance_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_instance_name
type: string
description: Service instance name
st_scaling:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_scaling
type: string
description: Indicates whether service scaling is enabled
max_num_fw_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: max_num_fw_instances
type: float
description: maximum number of firewall instances for scaling
start_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_src_ports
type: float
description: Start of src port
service_policy_direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_direction
type: string
description: Direction of Policy
st_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_name
type: string
description: Name of service template
count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: count
HSL_direct_net_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_gateway
type: string
description: HSL (Logging) network gateway address
st_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_image
type: string
description: Name of the image
st_shared_ip_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_shared_ip_list
type: string
description: List of shared ip enabled-disabled
prefix_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_0
type: string
Cricket_OCS_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_direct_net_id
type: string
description: Name of Cricket OCS network
oam_mgmt_net_1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: oam_mgmt_net_1_id
type: string
description: Name of OAM network
prefix_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_1
type: string
end_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_src_ports
type: float
description: End of src port
prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_2
type: string
end_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_dst_ports
type: float
description: End of dst port
st_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_image_name
type: string
description: Name of the image
HSL_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_id
type: string
description: Name of HSL (Logging) network
HSL_direct_net_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_cidr
type: string
description: HSL (Logging) network address (CIDR notation)
node_templates:
@@ -374,4 +614,4 @@ topology_template:
- service_instance_1
- service_instance_2
- hsl_direct_net
- - service_policy \ No newline at end of file
+ - service_policy
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
index 7b2ef898db..7ba76db7bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/oneServiceInstance/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,142 +11,342 @@ topology_template:
protected_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: protected_net
type: string
service_policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: service_policy_name
type: string
description: Policy Name
default: MNS-25180-L-02Shared_policy_direct_fw_protected_oam_1
oam_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: oam_direct_net_id
type: string
description: Name of private network to be created
st_static_routes_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_static_routes_list
type: string
description: List of static routes enabled-disabled
default: True,True,True,True
st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_type
type: string
description: service type
default: firewall
st_service_interface_type_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_service_interface_type_list
type: string
description: List of interface types
default: management,left,right,other
oam_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: oam_protected_net_id
type: string
description: Name of private network to be created
st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_mode
type: string
description: service mode
default: in-network-nat
static_prefix_3_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: static_prefix_3_1
type: string
description: prefix for static route
default: 107.239.80.0/21
oam_hsl_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: oam_hsl_net_id
type: string
description: Name of private network to be created
start_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: start_dst_ports
type: float
description: Start of dst port
default: -1
st_scaling:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_scaling
type: string
description: Indicates whether service scaling is enabled
default: 'True'
service_instance_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: service_instance_name
type: string
description: service instance name
max_num_fw_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: max_num_fw_instances
type: float
description: maximum number of firewall instances for scaling
default: 8
start_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: start_src_ports
type: float
description: Start of src port
default: -1
availability_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: availability_zone
type: string
description: availability zone in form of Zone:Host
service_policy_direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: service_policy_direction
type: string
description: Direction of Policy
default: <>
st_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_flavor_name
type: string
description: Flavor
default: lc.medium
st_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_name
type: string
description: service template name or ID
default: MNS-25180-L-02Shared_oam_fw_template_1
st_availability_zone_enable_flag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_availability_zone_enable_flag
type: string
description: service template availablity_zone feature enable flag
default: 'True'
st_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_image
type: string
description: Name of the image
default: NIMBUS_SRX_151X49-D303
st_shared_ip_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: st_shared_ip_list
type: string
description: List of shared ip enabled-disabled
default: False,True,False,False
oam_mgmt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: oam_mgmt_net_id
type: string
description: Name of private network to be created
end_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: end_src_ports
type: float
description: End of src port
default: -1
end_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - lcp1_mss.oam-fw_si
+ source_type: HEAT
+ param_name: end_dst_ports
type: float
description: End of dst port
default: -1
@@ -273,4 +473,4 @@ topology_template:
Version 2.0 10-14-2015 (Authors: Art Mishurov,am254u & Johhny Chen, jc3066) - HOT-OAM-FW-SI template that creates two OAM networks (direct and protected) with a scaled out firewall service between the two.
members:
- service_instance
- - service_policy \ No newline at end of file
+ - service_policy
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
index f0a62e7984..808c294b26 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sameServiceTemplate/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,143 +11,375 @@ topology_template:
service_policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_name
type: string
description: Policy Name
st_static_routes_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_static_routes_list
type: string
description: List of static routes enabled-disabled
st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_type
type: string
description: service type
st_service_interface_type_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_service_interface_type_list
type: string
description: List of interface types
st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_mode
type: string
description: service mode
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Name of Cricket OCS network
oam_mgmt_net_0_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: oam_mgmt_net_0_id
type: string
description: Name of OAM network
start_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_dst_ports
type: float
description: Start of dst port
st_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_flavor
type: string
description: Flavor
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: availability zone
service_instance_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_instance_name
type: string
description: Service instance name
st_scaling:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_scaling
type: string
description: Indicates whether service scaling is enabled
max_num_fw_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: max_num_fw_instances
type: float
description: maximum number of firewall instances for scaling
start_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_src_ports
type: float
description: Start of src port
service_policy_direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_direction
type: string
description: Direction of Policy
st_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_name
type: string
description: Name of service template
HSL_direct_net_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_gateway
type: string
description: HSL (Logging) network gateway address
st_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_image
type: string
description: Name of the image
st_shared_ip_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_shared_ip_list
type: string
description: List of shared ip enabled-disabled
prefix_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_0
type: string
Cricket_OCS_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_direct_net_id
type: string
description: Name of Cricket OCS network
oam_mgmt_net_1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: oam_mgmt_net_1_id
type: string
description: Name of OAM network
prefix_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_1
type: string
end_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_src_ports
type: float
description: End of src port
prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: prefix_2
type: string
end_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_dst_ports
type: float
description: End of dst port
st_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_image_name
type: string
description: Name of the image
HSL_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_id
type: string
description: Name of HSL (Logging) network
HSL_direct_net_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_cidr
type: string
description: HSL (Logging) network address (CIDR notation)
node_templates:
@@ -414,4 +646,4 @@ topology_template:
- service_instance_2
- hsl_direct_net1
- hsl_direct_net2
- - service_policy \ No newline at end of file
+ - service_policy
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml
index 108852543e..8d2476a20f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/sharedNetworkMulti/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,161 +11,433 @@ topology_template:
Internal1_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
service_policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_name
type: string
description: Policy Name
st_static_routes_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_static_routes_list
type: string
description: List of static routes enabled-disabled
st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_type
type: string
description: service type
Internal2_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
st_service_interface_type_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_service_interface_type_list
type: string
description: List of interface types
st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_mode
type: string
description: service mode
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Name of Cricket OCS network
oam_mgmt_net_0_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: oam_mgmt_net_0_id
type: string
description: Name of OAM network
start_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_dst_ports
type: float
description: Start of dst port
st_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_flavor
type: string
description: Flavor
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: availability zone
Internal2_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
service_instance_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_instance_name
type: string
description: Service instance name
st_scaling:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_scaling
type: string
description: Indicates whether service scaling is enabled
max_num_fw_instances:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: max_num_fw_instances
type: float
description: maximum number of firewall instances for scaling
Internal1_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
start_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: start_src_ports
type: float
description: Start of src port
service_policy_direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: service_policy_direction
type: string
description: Direction of Policy
st_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_name
type: string
description: Name of service template
Internal2_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal2_net_name
type: string
hsl_direct_net3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: hsl_direct_net3
type: string
hsl_direct_net4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: hsl_direct_net4
type: string
HSL_direct_net_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_gateway
type: string
description: HSL (Logging) network gateway address
hsl_direct_net1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: hsl_direct_net1
type: string
hsl_direct_net2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: hsl_direct_net2
type: string
st_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_image
type: string
description: Name of the image
st_shared_ip_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: st_shared_ip_list
type: string
description: List of shared ip enabled-disabled
Cricket_OCS_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: Cricket_OCS_direct_net_id
type: string
description: Name of Cricket OCS network
Internal1_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - network_base
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
end_src_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_src_ports
type: float
description: End of src port
end_dst_ports:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: end_dst_ports
type: float
description: End of dst port
HSL_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_id
type: string
description: Name of HSL (Logging) network
HSL_direct_net_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - OCS-fw
+ source_type: HEAT
+ param_name: HSL_direct_net_cidr
type: string
description: HSL (Logging) network address (CIDR notation)
node_templates:
@@ -380,4 +652,4 @@ topology_template:
members:
- Internal2-net
- Internal1-net
- - Internal3-net \ No newline at end of file
+ - Internal3-net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml
index f186c6f7e5..e1965246f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/listNet/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
description: dummy
lb_st_interface_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
description: dummy
oam_sec_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_sec_group_name
type: string
description: dummy
nems_traffic_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -238,4 +302,4 @@ topology_template:
- template_VMInt_OAM_lb_2
- jsa_net1
- template_VMInt_OAM_lb_3
- - template_VMInt_OAM_lb_4 \ No newline at end of file
+ - template_VMInt_OAM_lb_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml
index a515f5971f..8aeffd48c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressStaticValue/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
vlc1_Internal2_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal2_mac
type: string
description: static mac address assigned to vlc1_Internal2
internal_net_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_1
type: string
description: UUID of Internal2_net
internal_net_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_0
type: string
description: UUID of Internal1_net
security_group_int2_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int2_id
type: string
description: Security Group UUID for output
security_group_int1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int1_id
type: string
description: Security Group UUID for output
vlc1_Internal1_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal1_mac
type: string
description: static mac address assigned to vlc1_Internal1
vlc_st_interface_type_int1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int1
type: string
description: service_interface_type for the ServiceTemplate
vlc_st_interface_type_int2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int2
type: string
description: service_interface_type for the ServiceTemplate
node_templates:
@@ -68,4 +132,4 @@ topology_template:
description: |
Module HOT template to create vmme 2 vlc
members:
- - template_VMInt_INT1_VLC_1 \ No newline at end of file
+ - template_VMInt_INT1_VLC_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml
index a515f5971f..8aeffd48c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueInProperForm/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
vlc1_Internal2_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal2_mac
type: string
description: static mac address assigned to vlc1_Internal2
internal_net_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_1
type: string
description: UUID of Internal2_net
internal_net_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_0
type: string
description: UUID of Internal1_net
security_group_int2_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int2_id
type: string
description: Security Group UUID for output
security_group_int1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int1_id
type: string
description: Security Group UUID for output
vlc1_Internal1_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal1_mac
type: string
description: static mac address assigned to vlc1_Internal1
vlc_st_interface_type_int1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int1
type: string
description: service_interface_type for the ServiceTemplate
vlc_st_interface_type_int2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int2
type: string
description: service_interface_type for the ServiceTemplate
node_templates:
@@ -68,4 +132,4 @@ topology_template:
description: |
Module HOT template to create vmme 2 vlc
members:
- - template_VMInt_INT1_VLC_1 \ No newline at end of file
+ - template_VMInt_INT1_VLC_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml
index 40a11da8cf..977f6a6e57 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapOneItem/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
vlc1_Internal2_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal2_mac
type: string
description: static mac address assigned to vlc1_Internal2
internal_net_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_1
type: string
description: UUID of Internal2_net
internal_net_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_0
type: string
description: UUID of Internal1_net
security_group_int2_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int2_id
type: string
description: Security Group UUID for output
security_group_int1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int1_id
type: string
description: Security Group UUID for output
vlc1_Internal1_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal1_mac
type: string
description: static mac address assigned to vlc1_Internal1
vlc_st_interface_type_int1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int1
type: string
description: service_interface_type for the ServiceTemplate
vlc_st_interface_type_int2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int2
type: string
description: service_interface_type for the ServiceTemplate
node_templates:
@@ -80,4 +144,4 @@ topology_template:
Module HOT template to create vmme 2 vlc
members:
- template_VMInt_INT2_VLC_1
- - template_VMInt_INT1_VLC_1 \ No newline at end of file
+ - template_VMInt_INT1_VLC_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml
index 02bcfd23d0..6d84ffec48 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueMapTwoItems/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
vlc1_Internal2_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal2_mac
type: string
description: static mac address assigned to vlc1_Internal2
internal_net_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_1
type: string
description: UUID of Internal2_net
internal_net_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_0
type: string
description: UUID of Internal1_net
security_group_int2_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int2_id
type: string
description: Security Group UUID for output
security_group_int1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int1_id
type: string
description: Security Group UUID for output
vlc1_Internal1_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal1_mac
type: string
description: static mac address assigned to vlc1_Internal1
vlc_st_interface_type_int1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int1
type: string
description: service_interface_type for the ServiceTemplate
vlc_st_interface_type_int2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int2
type: string
description: service_interface_type for the ServiceTemplate
node_templates:
@@ -69,4 +133,4 @@ topology_template:
description: |
Module HOT template to create vmme 2 vlc
members:
- - template_VMInt_INT1_VLC_1 \ No newline at end of file
+ - template_VMInt_INT1_VLC_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml
index 2f40129966..c17f56efc8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/macAddressesValueNotAList/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,41 +9,105 @@ topology_template:
vlc1_Internal2_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal2_mac
type: string
description: static mac address assigned to vlc1_Internal2
internal_net_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_1
type: string
description: UUID of Internal2_net
internal_net_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: internal_net_id_0
type: string
description: UUID of Internal1_net
security_group_int2_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int2_id
type: string
description: Security Group UUID for output
security_group_int1_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: security_group_int1_id
type: string
description: Security Group UUID for output
vlc1_Internal1_mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc1_Internal1_mac
type: string
description: static mac address assigned to vlc1_Internal1
vlc_st_interface_type_int1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int1
type: string
description: service_interface_type for the ServiceTemplate
vlc_st_interface_type_int2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_vlc
+ source_type: HEAT
+ param_name: vlc_st_interface_type_int2
type: string
description: service_interface_type for the ServiceTemplate
node_templates:
@@ -65,4 +129,4 @@ topology_template:
description: |
Module HOT template to create vmme 2 vlc
members:
- - template_VMInt_INT1_VLC_1 \ No newline at end of file
+ - template_VMInt_INT1_VLC_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml
index 0a3846b721..557224978d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2VMinterface/oneNet/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,46 +9,118 @@ topology_template:
interface_param:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: interface_param
type: string
description: dummy
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
description: dummy
lb_st_interface_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
description: dummy
oam_sec_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_sec_group_name
type: string
description: dummy
nems_traffic_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -181,4 +253,4 @@ topology_template:
- template_VMInt_OAM_lb_2
- jsa_net1
- template_VMInt_OAM_lb_3
- - template_VMInt_OAM_lb_4 \ No newline at end of file
+ - template_VMInt_OAM_lb_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles/MainServiceTemplate.yaml
index db624ba819..84c2ef46a0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/listInterface/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,70 +9,190 @@ topology_template:
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
description: dummy
lb_st_interface_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
description: dummy
oam_sec_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_sec_group_name
type: string
description: dummy
virtual_ip_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: virtual_ip_address
type: string
nems_traffic_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: dummy
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: dummy
vlan_ids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vlan_ids
type: string
virtual_ipv6_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: virtual_ipv6_address
type: string
lb_st_vlan_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ 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:
+ - hot_template
+ source_type: HEAT
+ param_name: mac_address
type: string
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
subinterface_name_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ 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:
+ - hot_template
+ source_type: HEAT
+ param_name: subinterface_instance_index
type: float
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -444,4 +564,4 @@ topology_template:
- template_VMInt_OAM_lb_4
- template_Vlan_3
- template_Vlan_2
- - template_Vlan_1 \ No newline at end of file
+ - template_Vlan_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/MainServiceTemplate.yaml
index cdb8ddce7c..ecff1aa8d1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/MainServiceTemplate.yaml
@@ -9,78 +9,214 @@ topology_template:
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
description: dummy
lb_st_interface_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
description: dummy
oam_sec_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_sec_group_name
type: string
description: dummy
virtual_ip_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: virtual_ip_address
type: string
nems_traffic_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nems_traffic_name
type: string
description: dummy
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
description: not impotrtant
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: dummy
vlan_ids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vlan_ids
type: string
virtual_ipv6_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: virtual_ipv6_address
type: string
lb_st_vlan_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ 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:
+ - hot_template
+ source_type: HEAT
+ param_name: mac_address
type: string
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
subinterface_name_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ 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:
+ - hot_template
+ 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:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: string
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -668,4 +804,4 @@ topology_template:
- template_Vlan_4
- template_Vlan_3
- template_Vlan_2
- - template_Vlan_1 \ No newline at end of file
+ - template_Vlan_1
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 e26a807c29..ef413aaa1c 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
@@ -11,6 +11,14 @@ topology_template:
app_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF_volume
+ source_type: HEAT
+ param_name: app_volume_size_0
type: float
description: Size of Service Data 1 Volume for app VMs
default: 130
@@ -21,16 +29,40 @@ topology_template:
plt_data_floating_v6_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_data_floating_v6_ip
type: string
description: Floating IPv6 for plt VMs on the DATA network
iox_data_floating_v6_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_data_floating_v6_ip
type: string
description: Floating IPv6 for iox VMs on the DATA network
plt_data_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_data_v6_ips
type: list
description: Fixed IPv6 assignments for plt VMs on the DATA network
entry_schema:
@@ -38,6 +70,14 @@ topology_template:
iox_data_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_data_v6_ips
type: list
description: Fixed IPv6 assignments for iox VMs on the DATA network
entry_schema:
@@ -45,11 +85,27 @@ topology_template:
plt_volume_shared_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_volume_shared_id_0
type: string
description: ServiceData2 volume for plt VMs
plt_oam_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_oam_ips
type: list
description: Fixed IPv4 assignments for plt VMs on the OAM network
entry_schema:
@@ -58,23 +114,55 @@ topology_template:
label: OpenStack CA Certificate
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: openstack_cacert
type: string
description: CA Certificate to use for OpenStack client calls.
default: ''
siteinfo_url:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: siteinfo_url
type: string
description: siteinfo url
plt_pair_uuid:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_pair_uuid
type: string
description: UUID for plt VM pair
default: 573f433e25ba8
app_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_names
type: list
description: VM names for app VMs
entry_schema:
@@ -82,6 +170,14 @@ topology_template:
iox_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_names
type: list
description: VM names for iox VMs
entry_schema:
@@ -89,6 +185,14 @@ topology_template:
plt_servicedata2_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF_volume
+ source_type: HEAT
+ param_name: plt_servicedata2_volume_size_0
type: float
description: Size of Service Data 2 Volume for plt VMs
default: 150
@@ -99,11 +203,27 @@ topology_template:
app_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_volume_id_0
type: string
description: ServiceData1 volume for first app VM
plt_servicedata1_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF_volume
+ source_type: HEAT
+ param_name: plt_servicedata1_volume_size_0
type: float
description: Size of Service Data 1 Volume for plt VMs
default: 70
@@ -114,61 +234,149 @@ topology_template:
internal_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: internal_subnet_cidr
type: string
description: IP subnet for internal network
default: 169.30.12.0/24
app_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_volume_id_1
type: string
description: ServiceData1 volume for second app VM
domain:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: domain
type: string
description: What is this domain?
app_volume_id_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_volume_id_2
type: string
description: ServiceData1 volume for third app VM
plt_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_image_name
type: string
description: Pilot image
default: USP_IECF-PILOT_30.3.3-mcas4.4.6.qcow2
app_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_image_name
type: string
description: App image
default: USP_IECF-APP_30.3.3-mcas4.4.6.qcow2
plt_oam_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_oam_floating_ip
type: string
description: Floating IPv4 for plt VMs on the OAM network
plt_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_flavor_name
type: string
description: Pilot flavor
default: nd.c2r4d50
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
iox_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_flavor_name
type: string
description: IO flavor
default: nd.c2r4d50
app_security_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_security_groups
type: list
description: App security group
entry_schema:
@@ -176,23 +384,56 @@ topology_template:
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF_volume
+ - base_vIECCF
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance
config_server_cacert:
label: configure server CA Certificate
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: config_server_cacert
type: string
description: CA Certificate for download from siteinfo url and config url.
default: ''
vf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: Unique name for this VF Module instance
oam_security_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: oam_security_groups
type: list
description: OAM security group
entry_schema:
@@ -200,6 +441,14 @@ topology_template:
iox_oam_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_oam_ips
type: list
description: Fixed IPv4 assignments for iox VMs on the OAM network
entry_schema:
@@ -207,38 +456,94 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
iox_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_image_name
type: string
description: IO image
default: USP_IECF-IO_30.3.3-mcas4.4.6.qcow2
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name
ignore_siteinfo_audit:
label: Siteinfo Audit Ignore Flag
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: ignore_siteinfo_audit
type: string
description: Set to true if siteinfo audit failure should not prevent system installation
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Second availability zone ID or Name
data_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: data_net_id
type: string
description: DATA network
plt_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_names
type: list
description: VM names for plt VMs
entry_schema:
@@ -246,6 +551,14 @@ topology_template:
plt_security_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_security_groups
type: list
description: Pilot security group
entry_schema:
@@ -253,6 +566,14 @@ topology_template:
app_data_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_data_v6_ips
type: list
description: Fixed IPv6 assignments for app VMs on the DATA network
entry_schema:
@@ -260,6 +581,14 @@ topology_template:
iox_security_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_security_groups
type: list
description: IO security group
entry_schema:
@@ -267,17 +596,41 @@ topology_template:
ieccf_debug:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: ieccf_debug
type: string
description: IECCF debug flag
default: false
name_server_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: name_server_2
type: string
description: IP address of name server 2
app_oam_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_oam_ips
type: list
description: Fixed IPv4 assignments for app VMs on the OAM network
entry_schema:
@@ -285,48 +638,120 @@ topology_template:
app_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: app_flavor_name
type: string
description: App flavor
default: nd.c2r4d50
name_server_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: name_server_1
type: string
description: IP address of name server 1
oam_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: OAM network
iox_oam_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_oam_floating_ip
type: string
description: Floating IPv4 for iox VMs on the OAM network
ieccf_config_url:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: ieccf_config_url
type: string
description: IECCF configuration package URL
iox_pair_uuid:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: iox_pair_uuid
type: string
description: UUID for iox VM pair
default: 573f433e284b4
plt_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_volume_id_0
type: string
description: ServiceData1 volume for first plt VM
plt_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: plt_volume_id_1
type: string
description: ServiceData1 volume for second plt VM
data_security_groups:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vIECCF
+ source_type: HEAT
+ param_name: data_security_groups
type: list
description: DATA security group
entry_schema:
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 dc1e032e44..616ac37069 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,12 +57,28 @@ topology_template:
label: packet internal 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_internal_network_name
type: string
description: name of the network
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
@@ -46,6 +86,14 @@ topology_template:
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:
@@ -58,12 +106,28 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
diff_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: diff_image_name
type: string
description: PD image name
node_templates:
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 b9db6577bb..28836651f6 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -33,6 +49,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -40,6 +64,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -50,6 +82,14 @@ topology_template:
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
@@ -57,12 +97,28 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
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
@@ -70,6 +126,14 @@ topology_template:
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:
@@ -82,6 +146,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -93,6 +165,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -100,6 +180,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -107,6 +195,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -114,6 +210,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -121,6 +225,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -134,6 +246,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -141,12 +261,28 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
oam_server_names:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
entry_schema:
@@ -155,6 +291,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -162,6 +306,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 095a6c1a5e..3ae6fa0b26 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,12 +57,28 @@ topology_template:
label: packet internal 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_internal_network_name
type: string
description: name of the network
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
@@ -46,6 +86,14 @@ topology_template:
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:
@@ -58,6 +106,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
node_templates:
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 a40a3fdc30..172582fd24 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,12 +57,28 @@ topology_template:
label: packet internal 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_internal_network_name
type: string
description: name of the network
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
@@ -46,6 +86,14 @@ topology_template:
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:
@@ -58,12 +106,28 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
diff_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: diff_image_name
type: string
description: PD image name
node_templates:
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 765f1002d6..97fcee7365 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
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VNF Module instance
avpn_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_subnet_id
type: list
description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets
entry_schema:
@@ -23,6 +39,14 @@ topology_template:
sbg_internal_allocation_pool_start_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_start_ip
type: string
description: The start IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -30,6 +54,14 @@ topology_template:
internal_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: internal_net_id
type: string
description: the UUID of the operator-created Internal network
constraints:
@@ -37,11 +69,27 @@ topology_template:
sbg_sc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_flavor_name
type: string
description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required
sbg_management_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_cidr
type: string
description: Network address (CIDR notation) for SBG Management Network, IPv4
constraints:
@@ -49,6 +97,14 @@ topology_template:
sbg_comte_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_comte_floating_ip
type: string
description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -56,6 +112,14 @@ topology_template:
sbg_avpn_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_avpn_ips
type: list
description: |
comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count.
@@ -64,6 +128,14 @@ topology_template:
management_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_net_id
type: string
description: the UUID of the operator-created Management network
constraints:
@@ -71,6 +143,14 @@ topology_template:
sbg_sc_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_names
type: list
description: comma delimited list of VM names assigned to System Controller VMs
entry_schema:
@@ -78,6 +158,14 @@ topology_template:
sbg_management_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Management network.
entry_schema:
@@ -85,6 +173,14 @@ topology_template:
sbg_nfs_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_nfs_floating_ip
type: string
description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -92,11 +188,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
avpn_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_net_id
type: list
description: comma delimited list of the UUIDs of the operator-created AVPN networks
entry_schema:
@@ -104,11 +216,27 @@ topology_template:
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name.
sbg_internal_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Internal network
entry_schema:
@@ -116,6 +244,14 @@ topology_template:
sbg_management_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_floating_ip
type: string
description: Moveable Management IP (VIP), IPv4
constraints:
@@ -123,6 +259,14 @@ topology_template:
management_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_subnet_id
type: string
description: the UUID of the operator-created Management subnet, IPv4
constraints:
@@ -130,6 +274,14 @@ topology_template:
sbg_AVPN_vlan_tag_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_vlan_tag_list
type: list
description: comma delimited list of internal VLAN TAG(s) used by AVPN networks
entry_schema:
@@ -137,6 +289,14 @@ topology_template:
sbg_pl_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_names
type: list
description: comma delimited list of VM names assigned to Payload VMs
entry_schema:
@@ -144,6 +304,14 @@ topology_template:
sbg_management_gateway_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_gateway_ip_0
type: string
description: IPv4 IP address of the default gateway on Management network
constraints:
@@ -151,6 +319,14 @@ topology_template:
sbg_AVPN_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_count
type: float
description: The number of AVPN networks
constraints:
@@ -160,6 +336,14 @@ topology_template:
ntp_servers:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: ntp_servers
type: list
description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required
entry_schema:
@@ -167,6 +351,14 @@ topology_template:
sbg_management_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Management network
entry_schema:
@@ -174,6 +366,14 @@ topology_template:
core_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_subnet_id
type: string
description: the UUID of the operator-created Core subnet, IPv4
constraints:
@@ -181,6 +381,14 @@ topology_template:
sbg_internal_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values.
entry_schema:
@@ -188,6 +396,14 @@ topology_template:
sbg_boot_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_boot_floating_ip
type: string
description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -195,6 +411,14 @@ topology_template:
sbg_sc_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_0
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume
constraints:
@@ -202,11 +426,27 @@ topology_template:
sbg_pl_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_flavor_name
type: string
description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required
sbg_internal_allocation_pool_end_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_end_ip
type: string
description: The end IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -214,6 +454,14 @@ topology_template:
sbg_sc_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_1
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume
constraints:
@@ -221,6 +469,14 @@ topology_template:
sbg_internal_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_cidr
type: string
description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default!
constraints:
@@ -228,6 +484,14 @@ topology_template:
dummy_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: dummy_subnet_id
type: string
description: the UUID of the operator-created dummy subnet, IPv4
constraints:
@@ -235,6 +499,14 @@ topology_template:
trunk_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: trunk_net_id
type: string
description: the UUID of the operator-created Traffic network
constraints:
@@ -360,4 +632,4 @@ topology_template:
members:
- sbg_pl_trunk_subport_avpn_group_1
- sbg_pl_trunk_subport_avpn_group_0
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
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 628bf3df22..0741732d8b 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
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VNF Module instance
avpn_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_subnet_id
type: list
description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets
entry_schema:
@@ -23,6 +39,14 @@ topology_template:
internal_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: internal_net_id
type: string
description: the UUID of the operator-created Internal network
constraints:
@@ -30,6 +54,14 @@ topology_template:
sbg_AVPN_vlan_tag_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_vlan_tag_list
type: list
description: comma delimited list of internal VLAN TAG(s) used by AVPN networks
entry_schema:
@@ -37,6 +69,14 @@ topology_template:
sbg_AVPN_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_count
type: float
description: The number of AVPN networks
constraints:
@@ -46,11 +86,27 @@ topology_template:
sbg_sc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_flavor_name
type: string
description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required
sbg_comte_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_comte_floating_ip
type: string
description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -58,6 +114,14 @@ topology_template:
sbg_internal_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values.
entry_schema:
@@ -65,6 +129,14 @@ topology_template:
sbg_avpn_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_avpn_ips
type: list
description: |
comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count.
@@ -73,6 +145,14 @@ topology_template:
sbg_sc_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_names
type: list
description: comma delimited list of VM names assigned to System Controller VMs
entry_schema:
@@ -80,6 +160,14 @@ topology_template:
sbg_nfs_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_nfs_floating_ip
type: string
description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -87,6 +175,14 @@ topology_template:
sbg_boot_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_boot_floating_ip
type: string
description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -94,6 +190,14 @@ topology_template:
sbg_sc_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_0
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume
constraints:
@@ -101,11 +205,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
avpn_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_net_id
type: list
description: comma delimited list of the UUIDs of the operator-created AVPN networks
entry_schema:
@@ -113,6 +233,14 @@ topology_template:
sbg_sc_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_1
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume
constraints:
@@ -120,11 +248,27 @@ topology_template:
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name.
sbg_internal_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Internal network
entry_schema:
@@ -224,4 +368,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 \ No newline at end of file
+ - abstract_sbg_sc
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 bbae08d120..82cb2a4fa6 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
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VNF Module instance
avpn_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_subnet_id
type: list
description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets
entry_schema:
@@ -23,6 +39,14 @@ topology_template:
sbg_internal_allocation_pool_start_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_start_ip
type: string
description: The start IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -30,6 +54,14 @@ topology_template:
internal_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: internal_net_id
type: string
description: the UUID of the operator-created Internal network
constraints:
@@ -37,11 +69,27 @@ topology_template:
sbg_sc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_flavor_name
type: string
description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required
sbg_management_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_cidr
type: string
description: Network address (CIDR notation) for SBG Management Network, IPv4
constraints:
@@ -49,6 +97,14 @@ topology_template:
sbg_comte_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_comte_floating_ip
type: string
description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -56,6 +112,14 @@ topology_template:
sbg_avpn_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_avpn_ips
type: list
description: |
comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count.
@@ -64,6 +128,14 @@ topology_template:
management_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_net_id
type: string
description: the UUID of the operator-created Management network
constraints:
@@ -71,6 +143,14 @@ topology_template:
sbg_sc_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_names
type: list
description: comma delimited list of VM names assigned to System Controller VMs
entry_schema:
@@ -78,6 +158,14 @@ topology_template:
sbg_management_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Management network.
entry_schema:
@@ -85,6 +173,14 @@ topology_template:
sbg_nfs_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_nfs_floating_ip
type: string
description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -92,11 +188,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
avpn_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_net_id
type: list
description: comma delimited list of the UUIDs of the operator-created AVPN networks
entry_schema:
@@ -104,11 +216,27 @@ topology_template:
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name.
sbg_internal_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Internal network
entry_schema:
@@ -116,6 +244,14 @@ topology_template:
sbg_management_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_floating_ip
type: string
description: Moveable Management IP (VIP), IPv4
constraints:
@@ -123,6 +259,14 @@ topology_template:
management_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_subnet_id
type: string
description: the UUID of the operator-created Management subnet, IPv4
constraints:
@@ -130,6 +274,14 @@ topology_template:
sbg_AVPN_vlan_tag_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_vlan_tag_list
type: list
description: comma delimited list of internal VLAN TAG(s) used by AVPN networks
entry_schema:
@@ -137,6 +289,14 @@ topology_template:
sbg_pl_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_names
type: list
description: comma delimited list of VM names assigned to Payload VMs
entry_schema:
@@ -144,6 +304,14 @@ topology_template:
sbg_management_gateway_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_gateway_ip_0
type: string
description: IPv4 IP address of the default gateway on Management network
constraints:
@@ -151,6 +319,14 @@ topology_template:
sbg_AVPN_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_count
type: float
description: The number of AVPN networks
constraints:
@@ -160,6 +336,14 @@ topology_template:
ntp_servers:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: ntp_servers
type: list
description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required
entry_schema:
@@ -167,6 +351,14 @@ topology_template:
sbg_management_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Management network
entry_schema:
@@ -174,6 +366,14 @@ topology_template:
core_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_subnet_id
type: string
description: the UUID of the operator-created Core subnet, IPv4
constraints:
@@ -181,6 +381,14 @@ topology_template:
sbg_internal_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values.
entry_schema:
@@ -188,6 +396,14 @@ topology_template:
sbg_boot_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_boot_floating_ip
type: string
description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -195,6 +411,14 @@ topology_template:
sbg_sc_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_0
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume
constraints:
@@ -202,11 +426,27 @@ topology_template:
sbg_pl_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_flavor_name
type: string
description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required
sbg_internal_allocation_pool_end_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_end_ip
type: string
description: The end IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -214,6 +454,14 @@ topology_template:
sbg_sc_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_1
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume
constraints:
@@ -221,6 +469,14 @@ topology_template:
sbg_internal_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_cidr
type: string
description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default!
constraints:
@@ -228,6 +484,14 @@ topology_template:
dummy_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: dummy_subnet_id
type: string
description: the UUID of the operator-created dummy subnet, IPv4
constraints:
@@ -235,6 +499,14 @@ topology_template:
trunk_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: trunk_net_id
type: string
description: the UUID of the operator-created Traffic network
constraints:
@@ -360,4 +632,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 \ No newline at end of file
+ - abstract_sbg_sc
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 7ba8fcc315..d070beaf9e 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
@@ -11,11 +11,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VNF Module instance
avpn_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_subnet_id
type: list
description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets
entry_schema:
@@ -23,6 +39,14 @@ topology_template:
sbg_internal_allocation_pool_start_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_start_ip
type: string
description: The start IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -30,6 +54,14 @@ topology_template:
internal_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: internal_net_id
type: string
description: the UUID of the operator-created Internal network
constraints:
@@ -37,11 +69,27 @@ topology_template:
sbg_sc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_flavor_name
type: string
description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required
sbg_management_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_cidr
type: string
description: Network address (CIDR notation) for SBG Management Network, IPv4
constraints:
@@ -49,6 +97,14 @@ topology_template:
sbg_comte_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_comte_floating_ip
type: string
description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -56,6 +112,14 @@ topology_template:
sbg_avpn_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_avpn_ips
type: list
description: |
comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count.
@@ -64,6 +128,14 @@ topology_template:
management_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_net_id
type: string
description: the UUID of the operator-created Management network
constraints:
@@ -71,6 +143,14 @@ topology_template:
sbg_sc_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_names
type: list
description: comma delimited list of VM names assigned to System Controller VMs
entry_schema:
@@ -78,6 +158,14 @@ topology_template:
sbg_management_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Management network.
entry_schema:
@@ -85,6 +173,14 @@ topology_template:
sbg_nfs_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_nfs_floating_ip
type: string
description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -92,11 +188,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
avpn_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_net_id
type: list
description: comma delimited list of the UUIDs of the operator-created AVPN networks
entry_schema:
@@ -104,11 +216,27 @@ topology_template:
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name.
sbg_internal_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Internal network
entry_schema:
@@ -116,6 +244,14 @@ topology_template:
sbg_management_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_floating_ip
type: string
description: Moveable Management IP (VIP), IPv4
constraints:
@@ -123,6 +259,14 @@ topology_template:
management_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_subnet_id
type: string
description: the UUID of the operator-created Management subnet, IPv4
constraints:
@@ -130,6 +274,14 @@ topology_template:
sbg_AVPN_vlan_tag_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_vlan_tag_list
type: list
description: comma delimited list of internal VLAN TAG(s) used by AVPN networks
entry_schema:
@@ -137,6 +289,14 @@ topology_template:
sbg_pl_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_names
type: list
description: comma delimited list of VM names assigned to Payload VMs
entry_schema:
@@ -144,6 +304,14 @@ topology_template:
sbg_management_gateway_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_gateway_ip_0
type: string
description: IPv4 IP address of the default gateway on Management network
constraints:
@@ -151,6 +319,14 @@ topology_template:
sbg_AVPN_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_count
type: float
description: The number of AVPN networks
constraints:
@@ -160,6 +336,14 @@ topology_template:
ntp_servers:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: ntp_servers
type: list
description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required
entry_schema:
@@ -167,6 +351,14 @@ topology_template:
sbg_management_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Management network
entry_schema:
@@ -174,6 +366,14 @@ topology_template:
core_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_subnet_id
type: string
description: the UUID of the operator-created Core subnet, IPv4
constraints:
@@ -181,6 +381,14 @@ topology_template:
sbg_internal_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values.
entry_schema:
@@ -188,6 +396,14 @@ topology_template:
sbg_boot_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_boot_floating_ip
type: string
description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -195,6 +411,14 @@ topology_template:
sbg_sc_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_0
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume
constraints:
@@ -202,11 +426,27 @@ topology_template:
sbg_pl_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_flavor_name
type: string
description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required
sbg_internal_allocation_pool_end_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_end_ip
type: string
description: The end IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -214,6 +454,14 @@ topology_template:
sbg_sc_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_1
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume
constraints:
@@ -221,6 +469,14 @@ topology_template:
sbg_internal_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_cidr
type: string
description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default!
constraints:
@@ -228,6 +484,14 @@ topology_template:
dummy_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: dummy_subnet_id
type: string
description: the UUID of the operator-created dummy subnet, IPv4
constraints:
@@ -235,6 +499,14 @@ topology_template:
trunk_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: trunk_net_id
type: string
description: the UUID of the operator-created Traffic network
constraints:
@@ -399,4 +671,4 @@ topology_template:
members:
- sbg_pl_trunk_subport_avpn_group_0
- nested_sbg
- - abstract_sbg_sc \ No newline at end of file
+ - abstract_sbg_sc
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 40c00bbd33..1802188f23 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
@@ -11,6 +11,14 @@ topology_template:
avpn_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_subnet_id
type: list
description: comma delimited list of the UUIDs of the operator created IPv4 AVPN subnets
entry_schema:
@@ -18,6 +26,14 @@ topology_template:
sbg_internal_allocation_pool_start_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_start_ip
type: string
description: The start IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -25,6 +41,14 @@ topology_template:
sbg_core_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_core_ips
type: list
description: comma delimited list of IPv4 IPs to be used on Core network
entry_schema:
@@ -32,6 +56,14 @@ topology_template:
access_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: access_subnet_id
type: string
description: the UUID of the operator-created Access subnet, IPv4
constraints:
@@ -39,6 +71,14 @@ topology_template:
sbg_management_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_cidr
type: string
description: Network address (CIDR notation) for SBG Management Network, IPv4
constraints:
@@ -46,6 +86,14 @@ topology_template:
sbg_core_vlan_tag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_core_vlan_tag
type: float
description: The internal VLAN TAG for Core network
constraints:
@@ -55,6 +103,14 @@ topology_template:
management_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_net_id
type: string
description: the UUID of the operator-created Management network
constraints:
@@ -62,6 +118,14 @@ topology_template:
sbg_management_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Management network.
entry_schema:
@@ -69,6 +133,14 @@ topology_template:
sbg_nfs_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_nfs_floating_ip
type: string
description: Moveable IP (VIP) for NFS server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -76,6 +148,14 @@ topology_template:
sbg_charging_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_charging_ips
type: list
description: comma delimited list of IPv4 IPs to be used on Charging network
entry_schema:
@@ -83,6 +163,14 @@ topology_template:
sbg_internal_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Internal network
entry_schema:
@@ -90,6 +178,14 @@ topology_template:
core_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_net_id
type: string
description: the UUID of the operator-created Core network
constraints:
@@ -97,6 +193,14 @@ topology_template:
sbg_access_vlan_tag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_access_vlan_tag
type: float
description: The internal VLAN TAG for Access network
constraints:
@@ -106,6 +210,14 @@ topology_template:
management_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: management_subnet_id
type: string
description: the UUID of the operator-created Management subnet, IPv4
constraints:
@@ -113,6 +225,14 @@ topology_template:
access_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: access_net_id
type: string
description: the UUID of the operator-created Access network
constraints:
@@ -120,6 +240,14 @@ topology_template:
sbg_dummy_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_dummy_ips
type: list
description: comma delimited list of IPv4 IPs to be used on Dummy network
entry_schema:
@@ -127,6 +255,14 @@ topology_template:
sgi_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sgi_net_id
type: string
description: the UUID of the operator-created SGI network
constraints:
@@ -134,6 +270,14 @@ topology_template:
sbg_sgi_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sgi_ips
type: list
description: comma delimited list of IPv4 IPs to be used on SGI network
entry_schema:
@@ -141,6 +285,14 @@ topology_template:
sbg_internal_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_ips
type: list
description: comma delimited list of IPv4 addresses of SBG VMs on the Internal network. Don't deviate from the default values.
entry_schema:
@@ -148,6 +300,14 @@ topology_template:
core_v6_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_v6_subnet_id
type: string
description: the UUID of the operator-created Core subnet, IPv6
constraints:
@@ -155,6 +315,14 @@ topology_template:
sbg_internal_allocation_pool_end_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_allocation_pool_end_ip
type: string
description: The end IP of the Internal network's allocation pool. Don't deviate from default!
constraints:
@@ -162,6 +330,14 @@ topology_template:
UCOM_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: UCOM_subnet_id
type: string
description: the UUID of the operator-created UC One Mobile subnet, IPv4
constraints:
@@ -169,6 +345,14 @@ topology_template:
sbg_internal_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_internal_cidr
type: string
description: Network address (CIDR notation) for SBG intra-VM communication, IPv4. Don't deviate from default!
constraints:
@@ -176,6 +360,14 @@ topology_template:
sgi_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sgi_subnet_id
type: string
description: the UUID of the operator-created SGI subnet, IPv4
constraints:
@@ -183,6 +375,14 @@ topology_template:
trunk_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: trunk_net_id
type: string
description: the UUID of the operator-created Traffic network
constraints:
@@ -190,11 +390,27 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VNF Module instance
internal_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: internal_net_id
type: string
description: the UUID of the operator-created Internal network
constraints:
@@ -202,6 +418,14 @@ topology_template:
sbg_SGI_vlan_tag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_SGI_vlan_tag
type: float
description: The internal VLAN TAG for SGI network
constraints:
@@ -211,11 +435,27 @@ topology_template:
sbg_sc_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_flavor_name
type: string
description: Flavor to use for SC VM. Minimum 4 non-HT vCPU and 16GB RAM required
sbg_comte_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_comte_floating_ip
type: string
description: Moveable IP (VIP) for COM on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -223,6 +463,14 @@ topology_template:
charging_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: charging_net_id
type: string
description: the UUID of the operator-created Charging network
constraints:
@@ -230,6 +478,14 @@ topology_template:
sbg_UCOM_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_UCOM_ips
type: list
description: comma delimited list of IPv4 IPs to be used on UC One Mobile network
entry_schema:
@@ -237,6 +493,14 @@ topology_template:
sbg_avpn_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_avpn_ips
type: list
description: |
comma delimited list of IPv4 IPs to be used on AVPN networks. n*2 IP address expected where n is the number of PL VM pairs. The first two addresses are assigned to the first PL VM pair, second two IPs to the second PL VM pair, and so on. Note: this is true regardless of the number of AVPN networks and sbg_AVPN_count.
@@ -245,6 +509,14 @@ topology_template:
sbg_sc_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_names
type: list
description: comma delimited list of VM names assigned to System Controller VMs
entry_schema:
@@ -252,11 +524,27 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
avpn_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: avpn_net_id
type: list
description: comma delimited list of the UUIDs of the operator-created AVPN networks
entry_schema:
@@ -264,21 +552,53 @@ topology_template:
sbg_pl_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_image_name
type: string
description: the name of the Glance PXE boot image for PL VMs
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: First availability zone ID or Name.
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Second availability zone ID or Name.
UCOM_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: UCOM_net_id
type: string
description: the UUID of the operator-created UC One Mobile network
constraints:
@@ -286,6 +606,14 @@ topology_template:
sbg_UCOM_vlan_tag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_UCOM_vlan_tag
type: float
description: The internal VLAN TAG for UC One Mobile network
constraints:
@@ -295,6 +623,14 @@ topology_template:
sbg_management_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_floating_ip
type: string
description: Moveable Management IP (VIP), IPv4
constraints:
@@ -302,6 +638,14 @@ topology_template:
dummy_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: dummy_net_id
type: string
description: the UUID of the operator-created Dummy network
constraints:
@@ -309,6 +653,14 @@ topology_template:
sbg_core_v6_IPs:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_core_v6_IPs
type: list
description: comma delimited list of IPv6 IPs to be used on Core network
entry_schema:
@@ -316,6 +668,14 @@ topology_template:
sbg_AVPN_vlan_tag_list:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_vlan_tag_list
type: list
description: comma delimited list of internal VLAN TAG(s) used by AVPN networks
entry_schema:
@@ -323,6 +683,14 @@ topology_template:
sbg_pl_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_names
type: list
description: comma delimited list of VM names assigned to Payload VMs
entry_schema:
@@ -330,6 +698,14 @@ topology_template:
sbg_management_gateway_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_gateway_ip_0
type: string
description: IPv4 IP address of the default gateway on Management network
constraints:
@@ -337,6 +713,14 @@ topology_template:
sbg_AVPN_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_AVPN_count
type: float
description: The number of AVPN networks
constraints:
@@ -346,6 +730,14 @@ topology_template:
sbg_charging_vlan_tag:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_charging_vlan_tag
type: float
description: The internal VLAN TAG for Charging network
constraints:
@@ -355,11 +747,27 @@ topology_template:
sbg_timezone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_timezone
type: string
description: Timezone.
ntp_servers:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: ntp_servers
type: list
description: comma delimited list of NTP servers required by System Controller VMs. Exactly 2 IPv4 values are required
entry_schema:
@@ -367,6 +775,14 @@ topology_template:
sbg_management_mac_addresses:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_management_mac_addresses
type: list
description: comma delimited list of MAC addresses for the VMs on the Management network
entry_schema:
@@ -374,6 +790,14 @@ topology_template:
core_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: core_subnet_id
type: string
description: the UUID of the operator-created Core subnet, IPv4
constraints:
@@ -381,6 +805,14 @@ topology_template:
sbg_access_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_access_ips
type: list
description: comma delimited list of IPv4 IPs to be used on Access network
entry_schema:
@@ -388,6 +820,14 @@ topology_template:
sbg_sc_volume_id_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_3
type: string
description: the UUID of the pre-created Cinder volume attached to SC-2 as tools volume
constraints:
@@ -395,6 +835,14 @@ topology_template:
sbg_boot_floating_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_boot_floating_ip
type: string
description: Moveable IP (VIP) for TFTP server on the Internal network, IPv4. Don't deviate from default!
constraints:
@@ -402,6 +850,14 @@ topology_template:
sbg_sc_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_0
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as root volume
constraints:
@@ -409,11 +865,27 @@ topology_template:
sbg_pl_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_pl_flavor_name
type: string
description: Flavor to use for PL VM. Minimum 8 non-HT vCPU and 64GB RAM required
sbg_sc_volume_id_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_2
type: string
description: the UUID of the pre-created Cinder volume attached to SC-2 as root volume
constraints:
@@ -421,6 +893,14 @@ topology_template:
sbg_sc_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: sbg_sc_volume_id_1
type: string
description: the UUID of the pre-created Cinder volume attached to SC-1 as tools volume
constraints:
@@ -428,6 +908,14 @@ topology_template:
dummy_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - DPA3_New_VNF_TSBGv_base
+ source_type: HEAT
+ param_name: dummy_subnet_id
type: string
description: the UUID of the operator-created dummy subnet, IPv4
constraints:
@@ -599,4 +1087,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 \ No newline at end of file
+ - abstract_sbg_sc
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 2921549e6b..beda5a1750 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
@@ -12,44 +12,116 @@ topology_template:
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:
@@ -57,30 +129,86 @@ topology_template:
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:
@@ -1032,4 +1160,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - 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/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 14cf9ceae0..2b1e9618f8 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
@@ -12,44 +12,116 @@ topology_template:
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:
@@ -57,30 +129,86 @@ topology_template:
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:
@@ -873,4 +1001,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - 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/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 e4577fe60e..05ad6b129c 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
@@ -12,44 +12,116 @@ topology_template:
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:
@@ -57,30 +129,86 @@ topology_template:
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:
@@ -844,4 +972,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - 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/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 4c55b814b8..f8806cfb44 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
@@ -12,52 +12,140 @@ topology_template:
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:
@@ -65,38 +153,110 @@ topology_template:
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:
@@ -1950,4 +2110,4 @@ topology_template:
name: def
affinity: host
targets:
- - BE_Affinity_group \ No newline at end of file
+ - BE_Affinity_group
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 43aeb451a9..209135c25a 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
@@ -11,16 +11,40 @@ topology_template:
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:
@@ -28,30 +52,78 @@ 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 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:
@@ -59,21 +131,53 @@ topology_template:
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:
@@ -82,20 +186,52 @@ topology_template:
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:
@@ -294,4 +430,4 @@ topology_template:
- test_nested_pattern_4_main_0
- abstract_pd_server_main_1b_1
- abstract_ps_server_main_1b_1
- - abstract_cmaui_1c1_main_1 \ No newline at end of file
+ - 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/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml
index 6926f33ace..9ff8c4ea56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/MainServiceTemplate.yaml
@@ -11,21 +11,53 @@ topology_template:
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
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
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
node_templates:
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 e53177de56..8fdf0c1e04 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
@@ -12,34 +12,82 @@ topology_template:
label: PD flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_flavor_name
type: string
description: flavor name of PD instance
p1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: p1
type: string
description: UID of OAM network
availabilityzone_name:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
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: network name of jsa log network
pd_image_name:
label: image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_image_name
type: string
description: PD image name
pd_server_names:
label: PD server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_server_names
type: list
description: name of the PD instance
entry_schema:
@@ -47,11 +95,27 @@ topology_template:
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: net name
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:
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 2c7daf72af..9914f9b938 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
@@ -12,34 +12,82 @@ topology_template:
label: PD flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_flavor_name
type: string
description: flavor name of PD instance
p1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: p1
type: string
description: UID of OAM network
availabilityzone_name:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
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: network name of jsa log network
pd_image_name:
label: image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_image_name
type: string
description: PD image name
pd_server_names:
label: PD server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: pd_server_names
type: list
description: name of the PD instance
entry_schema:
@@ -47,11 +95,27 @@ topology_template:
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: net name
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:
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 16ea9d76c1..16e7d2c267 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
@@ -11,21 +11,53 @@ topology_template:
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:
@@ -33,14 +65,38 @@ topology_template:
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:
@@ -48,6 +104,14 @@ topology_template:
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:
@@ -55,15 +119,39 @@ topology_template:
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:
@@ -71,6 +159,14 @@ topology_template:
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:
@@ -78,54 +174,142 @@ topology_template:
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:
@@ -512,4 +696,4 @@ topology_template:
value:
get_attribute:
- abstract_osm_server_1c2_1
- - osm_server_1c2_accessIPv4 \ No newline at end of file
+ - 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/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml
index 8db4155247..e7e53e33ad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
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:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
index 1926fafee1..edb739aa61 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
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:
@@ -98,4 +106,4 @@ topology_template:
- dependsOn_network
- test_nested_pattern_4
- test_nested_no_compute
- - test_nested_all_patterns \ No newline at end of file
+ - test_nested_all_patterns
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml
index f2c32347e0..c5e45d63ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
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:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml
index ddf4044b17..71b749c66b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
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:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml
index aabe7d7229..1cd4986a35 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
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:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml
index 6ab38e9cdd..991c837d3c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
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: network name of jsa log 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
node_templates:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml
index 2548fb9b30..fbbfe767d7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/MainServiceTemplate.yaml
@@ -11,26 +11,66 @@ topology_template:
same_file_param_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: same_file_param_1
type: string
description: network name of jsa log network
same_file_param_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: same_file_param_2
type: string
description: network name of jsa log network
same_file_param_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: same_file_param_3
type: string
description: network name of jsa log network
diff_file_param_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: diff_file_param_1
type: string
description: network name of jsa log 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
node_templates:
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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml
index f5b820a913..0c7dc7ba78 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
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
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:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index d2af2b96c2..7c8b9dcb3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -19,6 +27,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -26,12 +42,28 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -42,16 +74,40 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
node_templates:
server_pcm_002:
@@ -193,4 +249,4 @@ topology_template:
- server_pcm_002
- server_pcm_001
- compute_port_0
- - abstract_compute \ No newline at end of file
+ - abstract_compute
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 df0d79f0a8..1b4baf5024 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
@@ -11,34 +11,82 @@ topology_template:
cif_internal_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_internal_ip_0
type: string
description: Internal IP of CIF01 instance
default: 192.168.210.1
vcscf_release:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_release
type: string
description: IMS release
default: '17.0'
cif_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_name_1
type: string
description: CIF02 instance name
cif_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_name_0
type: string
description: CIF01 instance name
cif_internal_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_internal_ip_1
type: string
description: Internal IP of CIF02 instance
default: 192.168.210.2
tdcore_zone_0_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_0_count
type: float
description: |
Number of TD Core VMs to be deployed zone 0. This parameter is used to scale the TD Core instances.
@@ -50,17 +98,41 @@ topology_template:
lbd_internal_dpdk_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_internal_dpdk_vip_0
type: string
description: Internal DPDK CIP IP of LBD
default: 192.168.211.181
lbd_ims_core_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_ims_core_v6_vip_0
type: string
description: IMS CORE CIPA v6 IP of LBD
cscf_zone_1_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_1_count
type: float
description: |
Number of CSCF to be deployed on zone 1. This parameter is used to scale the cscf instances.
@@ -72,39 +144,95 @@ topology_template:
oam_internal_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_internal_vip_0
type: string
description: Internal CIPA IP of OAM unit
default: 192.168.210.3
cscf_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_image_name
type: string
description: CSCF server VM image name
default: IMS_17_0_OPENSTACK_CSCF_1701400.000
cif_internal_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_internal_vip_0
type: string
description: Internal CIPA IP of CIF
default: 192.168.210.150
cif_ims_core_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_core_v6_ip_0
type: string
description: IMS CORE v6 IP of CIF01 instance
cif_ims_core_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_core_v6_ip_1
type: string
description: IMS CORE v6 IP of CIF02 instance
oam_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_volume_id_1
type: string
description: size of the cinder volume used for oam
oam_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ source_type: HEAT
+ param_name: oam_volume_size_0
type: float
description: Size of Volume for oam VMs
default: 300
@@ -115,16 +243,40 @@ topology_template:
oam_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_volume_id_0
type: string
description: size of the cinder volume used for oam
vcscf_oam_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_oam_netmask
type: string
description: Netmask for OAM LAN
tdcore_zone_1_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_1_names
type: list
description: List of instance names for TDCORE instances on zone 1
entry_schema:
@@ -132,44 +284,108 @@ topology_template:
cif_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_flavor_name
type: string
description: CSCF CIF VM flavor
default: ND.c4r16d38
vcscf_dns_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_dns_address
type: string
description: DNS server IP
vcscf_internal_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_internal_network_cidr
type: string
description: CIDR for for Internal LAN
default: 192.168.210.0/24
cdi_ims_core_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_ims_core_v6_ip_1
type: string
description: IMS CORE LAN v6 IP of CDI02 instance
cdi_ims_core_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_ims_core_v6_ip_0
type: string
description: IMS CORE LAN v6 IP of CDI01 instance
cdi_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_flavor_name
type: string
description: CDI VM flavor
default: ND.c4r8d38
vcscf_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_default_gateway
type: string
description: Default gateway for OAM LAN
tdcore_zone_0_uuids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_0_uuids
type: list
description: List of UUIDs generated by cmrepo for TDCORE instances on zone 0
entry_schema:
@@ -177,21 +393,53 @@ topology_template:
oam_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_name_1
type: string
description: OAM02 instance name
oam_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_name_0
type: string
description: OAM01 instance name
oam_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_name_2
type: string
description: OAM03 instance name
cscf_zone_1_uuids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_1_uuids
type: list
description: List of UUIDs generated by cmrepo for CSCF instances on zone 1
entry_schema:
@@ -199,16 +447,40 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
oam_oam_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_oam_ip_0
type: string
description: OAM IP of OAM01 instance
cscf_internal_zone_1_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_internal_zone_1_ips
type: list
description: List of Internal Lan IPs for CSCF instances on zone 1
default:
@@ -235,32 +507,81 @@ topology_template:
cif_ims_li_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_li_v6_vip_0
type: string
description: IMS LI CIPA v6 IP of CIF
oam_oam_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_oam_ip_1
type: string
description: OAM IP of OAM02 instance
oam_oam_ip_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_oam_ip_2
type: string
description: OAM IP of OAM03 instance
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ - base_cscf
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance
lbd_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_flavor_name
type: string
description: CSCF LBD VM flavor
default: ND.c4r16d38
cscf_zone_0_uuids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_0_uuids
type: list
description: List of UUIDs generated by cmrepo for CSCF instances on zone 0
entry_schema:
@@ -268,17 +589,41 @@ topology_template:
vf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: Unique name for this VF Module instance
cdi_internal_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_internal_ip_0
type: string
description: Internal IP of CDI01 instance
default: 192.168.210.139
cscf_zone_0_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_0_names
type: list
description: List of instance names for CSCF instances on zone 0
entry_schema:
@@ -286,75 +631,189 @@ topology_template:
oam_oam_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_oam_vip_0
type: string
description: OAM CIPA IP of OAM unit
vcscf_swrepo_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_swrepo_address
type: string
description: SWRepo IP or FQDN
cdi_internal_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_internal_ip_1
type: string
description: Internal IP of CDI02 instance
default: 192.168.210.140
cdi_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_name_1
type: string
description: CDI02 instance name
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ - base_cscf
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Storage availability zone for volume of first vm
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ - base_cscf
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Storage availability zone for volume of second vm
tdcore_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_image_name
type: string
description: TDCORE VM image name
default: IMS_17_0_OPENSTACK_CSCF_1701400.000
tdcore_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_flavor_name
type: string
description: TDCORE VM flavor
default: ND.c4r16d38
cscf_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_flavor_name
type: string
description: CSCF server VM flavor
default: ND.c8r16d38
vcscf_cmrepo_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_cmrepo_address
type: string
description: CMRepo IP or FQDN
cdi_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_name_0
type: string
description: CDI01 instance name
lbd_ims_core_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_ims_core_v6_ip_0
type: string
description: IMS CORE v6 IP of LBD01 instance
lbd_ims_core_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_ims_core_v6_ip_1
type: string
description: IMS CORE v6 IP of LBD02 instance
tdcore_internal_zone_1_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_internal_zone_1_ips
type: list
description: List of Internal Lan IPs for TDCORE instances on zone 1
default:
@@ -367,17 +826,41 @@ topology_template:
oam_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: Name/UUID of OAM network
cdi_internal_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_internal_v6_vip_0
type: string
description: Internal v6 CIPA IP of CDI
default: 2a00:9a00:a000:1190:0:1:1:2b8d
tdcore_dpdk_zone_1_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_dpdk_zone_1_ips
type: list
description: List of DPDK Lan IPs for TDCORE instances on zone 1
default:
@@ -390,18 +873,42 @@ topology_template:
oam_internal_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_internal_ip_0
type: string
description: Internal IP of OAM01 instance
default: 192.168.210.136
oam_internal_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_internal_ip_1
type: string
description: Internal IP of OAM01 instance
default: 192.168.210.137
cscf_zone_0_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_0_count
type: float
description: |
Number of CSCF to be deployed on zone 0. This parameter is used to scale the cscf instances.
@@ -413,12 +920,28 @@ topology_template:
oam_internal_ip_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_internal_ip_2
type: string
description: Internal IP of OAM01 instance
default: 192.168.210.138
cscf_zone_1_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_zone_1_names
type: list
description: List of instance names for CSCF instances on zone 1
entry_schema:
@@ -426,6 +949,14 @@ topology_template:
tdcore_zone_0_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_0_names
type: list
description: List of instance names for TDCORE instances on zone 0
entry_schema:
@@ -433,55 +964,135 @@ topology_template:
lbd_uuid_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_uuid_0
type: string
description: UUID generated by cmrepo for LBD01
lbd_uuid_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_uuid_1
type: string
description: UUID generated by cmrepo for LBD02
cdi_internal_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_internal_v6_ip_1
type: string
description: Internal v6 IP of CDI02 instance
default: 2a00:9a00:a000:1190:0:1:1:2b8c
cdi_internal_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_internal_v6_ip_0
type: string
description: Internal v6 IP of CDI01 instance
default: 2a00:9a00:a000:1190:0:1:1:2b8b
cdi_uuid_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_uuid_1
type: string
description: UUID generated by cmrepo for CDI02
ims_core_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: ims_core_net_id
type: string
description: Name/UUID of Core network
cdi_uuid_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_uuid_0
type: string
description: UUID generated by cmrepo for CDI01
vcscf_internal_network_v6_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_internal_network_v6_cidr
type: string
description: CIDR for for Internal LAN v6
default: 2a00:9a00:a000:1190:0:1:1:2b00/120
oam_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: OAM VM image name
default: IMS_17_0_OPENSTACK_OAM_1701400.000
tdcore_zone_1_uuids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_1_uuids
type: list
description: List of UUIDs generated by cmrepo for TDCORE instances on zone 1
entry_schema:
@@ -489,6 +1100,14 @@ topology_template:
vcscf_internal_network_mtu:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_internal_network_mtu
type: float
description: MTU for internal network interface (eth0)
default: 1500
@@ -499,12 +1118,28 @@ topology_template:
vcscf_internal_dpdk_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_internal_dpdk_network_cidr
type: string
description: CIDR for for Internal LAN DPDK
default: 192.168.211.0/24
tdcore_zone_1_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_zone_1_count
type: float
description: |
Number of TD Core VMs to be deployed zone 1. This parameter is used to scale the TD Core instances.
@@ -516,6 +1151,14 @@ topology_template:
cif_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ source_type: HEAT
+ param_name: cif_volume_size_0
type: float
description: Size of Volume for cif VMs
default: 300
@@ -526,71 +1169,175 @@ topology_template:
oam_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: OAM VM flavor
default: ND.c4r32d30
ims_li_v6_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: ims_li_v6_net_id
type: string
description: Name/UUID of V6 LI network
lbd_internal_dpdk_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_internal_dpdk_ip_1
type: string
description: Internal DPDK IP of LBD02 instance
default: 192.168.211.2
cif_ims_core_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_core_v6_vip_0
type: string
description: IMS CORE v6 CIPA IP of CIF
lbd_internal_dpdk_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_internal_dpdk_ip_0
type: string
description: Internal DPDK IP of LBD01 instance
default: 192.168.211.1
cdi_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_image_name
type: string
description: CDI VM image name
default: IMS_17_0_OPENSTACK_CSCF_1701400.000
oam_uuid_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_uuid_2
type: string
description: UUID generated by cmrepo for OAM03
oam_uuid_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_uuid_1
type: string
description: UUID generated by cmrepo for OAM02
oam_uuid_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: oam_uuid_0
type: string
description: UUID generated by cmrepo for OAM01
cif_oam_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_vip_0
type: string
description: OAM CIPA IP of CIF
cif_internal_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_internal_v6_ip_1
type: string
description: Internal IP v6 of CIF02 instance
default: 2a00:9a00:a000:1190:0:1:1:2b05
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
cscf_internal_zone_0_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_internal_zone_0_v6_ips
type: list
description: List of Internal Lan v6 IPs for CSCF instances on zone 0
default:
@@ -618,6 +1365,14 @@ topology_template:
cscf_internal_zone_1_v6_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_internal_zone_1_v6_ips
type: list
description: List of Internal Lan v6 IPs for CSCF instances on zone 1
default:
@@ -644,55 +1399,135 @@ topology_template:
cif_internal_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_internal_v6_ip_0
type: string
description: Internal IP v6 of CIF01 instance
default: 2a00:9a00:a000:1190:0:1:1:2b04
lbd_internal_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_internal_ip_1
type: string
description: Internal IP of LBD02 instance
default: 192.168.210.5
cif_oam_vip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_vip_1
type: string
description: OAM (LI-X1) v4 CIPA of CIF
lbd_internal_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_internal_ip_0
type: string
description: Internal IP of LBD01 instance
default: 192.168.210.4
cif_volume_id_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_volume_id_0
type: string
description: size of the cinder volume used for cif
cif_ims_li_v6_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_li_v6_ip_0
type: string
description: IMS LI v6 IP of CIF01 instance
cif_volume_id_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_volume_id_1
type: string
description: size of the cinder volume used for cif
cif_ims_li_v6_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_ims_li_v6_ip_1
type: string
description: IMS LI v6 IP of CIF02 instance
lbd_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_image_name
type: string
description: CSCF LBD VM image name
default: IMS_17_0_OPENSTACK_CSCF_1701400.000
tdcore_dpdk_zone_0_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_dpdk_zone_0_ips
type: list
description: List of DPDK Lan IPs for TDCORE instances on zone 0
default:
@@ -705,33 +1540,82 @@ topology_template:
cif_uuid_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_uuid_0
type: string
description: UUID generated by cmrepo for CIF01
cif_uuid_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_uuid_1
type: string
description: UUID generated by cmrepo for CIF02
cif_oam_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_ip_0
type: string
description: OAM IP of CIF01 instance
cif_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_image_name
type: string
description: CSCF CIF VM image name
default: IMS_17_0_OPENSTACK_CSCF_1701400.000
vcscf_internal_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_internal_netmask
type: string
description: Netmask for Internal LAN
default: 255.255.255.0
vcscf_name_delimeter:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf_volume
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_name_delimeter
type: string
description: 'delimeter used in concatenating different words while naming (ex:
"-","_",".",...)'
@@ -745,36 +1629,92 @@ topology_template:
cif_oam_ip_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_ip_3
type: string
description: OAM (LI-X1) v4 IP of CIF02 instance
cif_oam_ip_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_ip_2
type: string
description: OAM (LI-X1) v4 IP of CIF01 instance
cif_oam_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cif_oam_ip_1
type: string
description: OAM IP of CIF02 instance
cdi_ims_core_v6_vip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cdi_ims_core_v6_vip_0
type: string
description: IMS CORE LAN CIPA v6 IP of CDI
vcscf_dn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_dn
type: string
description: DN name
vcscf_du:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: vcscf_du
type: string
description: DU name
cscf_internal_zone_0_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: cscf_internal_zone_0_ips
type: list
description: List of Internal Lan IPs for CSCF instances on zone 0
default:
@@ -802,6 +1742,14 @@ topology_template:
tdcore_internal_zone_0_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: tdcore_internal_zone_0_ips
type: list
description: List of Internal Lan IPs for TDCORE instances on zone 0
default:
@@ -814,11 +1762,27 @@ topology_template:
lbd_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_name_1
type: string
description: LBD02 instance name
lbd_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_cscf
+ source_type: HEAT
+ param_name: lbd_name_0
type: string
description: LBD01 instance name
node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index c36094adeb..4c0ebb89b7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-app-flavor
@@ -19,12 +27,28 @@ topology_template:
label: vSON DBG Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_volume_id_0
type: string
description: Volume ID of the vSON DBG server.
vson_dbs_server_group_id:
label: vSON DBS server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -34,6 +58,14 @@ topology_template:
label: vSON MON volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon_volume
+ source_type: HEAT
+ param_name: vson_mon_volume_name_0
type: string
description: Volume name.
default: vson_mon_volume_0
@@ -41,12 +73,28 @@ topology_template:
label: vSON DBS volume name 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs_volume
+ source_type: HEAT
+ param_name: vson_dbs_volume_name_0
type: string
description: First volume name.
vson_dbs_volume_size_1:
label: vSON DBS volume ID 1 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs_volume
+ source_type: HEAT
+ param_name: vson_dbs_volume_size_1
type: float
description: Size of the second Cinder volume. Measured in gigabytes.
default: 500
@@ -54,12 +102,28 @@ topology_template:
label: vSON Mediator Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr
+ source_type: HEAT
+ param_name: vson_mdr_volume_id_0
type: string
description: Volume ID of the vSON Mediator server.
vson_mgt_volume_name_0:
label: vSON MGT volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ source_type: HEAT
+ param_name: vson_mgt_volume_name_0
type: string
description: Volume name.
default: vson_mgt_volume_0
@@ -67,12 +131,28 @@ topology_template:
label: vSON DBS volume name 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs_volume
+ source_type: HEAT
+ param_name: vson_dbs_volume_name_1
type: string
description: Second volume name.
vson_dbs_volume_size_0:
label: vSON DBS volume ID 0 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs_volume
+ source_type: HEAT
+ param_name: vson_dbs_volume_size_0
type: float
description: Size of the first Cinder volume. Measured in gigabytes.
default: 500
@@ -80,12 +160,28 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon
+ source_type: HEAT
+ param_name: vson_mon_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
vson_mon_volume_size_0:
label: vSON MON cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon_volume
+ source_type: HEAT
+ param_name: vson_mon_volume_size_0
type: float
description: Size of the Cinder volume. Measured in gigabytes.
default: 100
@@ -93,6 +189,14 @@ topology_template:
label: vSON MON VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon_volume
+ source_type: HEAT
+ param_name: vson_mon_image_name
type: string
description: Image name the volume will be created from.
default: VSON-BASE-1.0
@@ -100,12 +204,38 @@ topology_template:
label: OAM net subnet prefix length
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: oam_net_subnet_prefix_length
type: string
description: OAM network subnet prefix length.
swift_storage_url:
label: swift storage URL
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: swift_storage_url
type: string
description: |
Swift storage URL. Example: http://172.16.209.246:8080/v1/AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 http://172.16.209.246:8080 - protocol, IP and port, v1 - API version AUTH_a4d426b5ef2e41408a8e6e6b9a8d3029 - account ID
@@ -113,18 +243,52 @@ topology_template:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_image_name
type: string
description: VM Image name the vSON DC leader instance will be created from.
vson_app_oam_net_v6_ip_0:
label: vSON APP OAM network IPv6 address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_oam_net_v6_ip_0
type: string
description: Fixed IPv6 assignment for the vSON APP instance on the OAM network.
dns_servers:
label: DNS servers
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: dns_servers
type: list
description: List of DNS servers.
entry_schema:
@@ -133,6 +297,14 @@ topology_template:
label: vSON APP cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app_volume
+ source_type: HEAT
+ param_name: vson_app_volume_size_0
type: float
description: |
Size of the Cinder volume. Measured in gigabytes.
@@ -141,6 +313,23 @@ topology_template:
label: OAM network security group ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: oam_net_security_group_id
type: string
description: |
The ID of Security group applied on the port bound to the vSON OAM network.
@@ -148,6 +337,14 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ source_type: HEAT
+ param_name: vson_mgt_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-mgt-flavor
@@ -155,6 +352,14 @@ topology_template:
label: vSON MGT cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ source_type: HEAT
+ param_name: vson_mgt_volume_size_0
type: float
description: Size of the Cinder volume. Measured in gigabytes.
default: 100
@@ -162,24 +367,56 @@ topology_template:
label: vSON DBS Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_volume_id_0
type: string
description: Volume ID of the first vSON DBS server.
vson_dbc_volume_id_0:
label: vSON DBC Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_volume_id_0
type: string
description: Volume ID of the vSON DBC server.
vson_dbs_volume_id_1:
label: vSON DBS Volume ID 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_volume_id_1
type: string
description: Volume ID of the second vSON DBS server.
vson_dbc_image_name:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_image_name
type: string
description: VM Image name the vSON DBC instance will be created from.
default: VSON-BASE-1.0
@@ -187,6 +424,14 @@ topology_template:
label: vSON Management VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ source_type: HEAT
+ param_name: vson_mgt_image_name
type: string
description: Image name the volume will be created from.
default: VSON-BASE-1.0
@@ -194,12 +439,28 @@ topology_template:
label: Default IPv6 gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: default_gateway_v6
type: string
description: Default IPv6 gateway.
vson_mgt_server_group_id:
label: vSON Management server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ source_type: HEAT
+ param_name: vson_mgt_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -209,12 +470,29 @@ topology_template:
label: vSON Cluster Manager instance name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_9_vson_clm
+ - base_vson
+ source_type: HEAT
+ param_name: vson_clm_name_0
type: string
description: Unique name to be issued to the vSON Cluster Manager instance.
vson_dbc_server_group_policy:
label: vSON Database server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_dbc_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Database instances.
@@ -223,6 +501,14 @@ topology_template:
label: vSON Cluster Management server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_clm_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster Management instances.
@@ -231,6 +517,14 @@ topology_template:
label: vSON MON server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_mon_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON MON instances.
@@ -239,6 +533,14 @@ topology_template:
label: vSON DBS server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -248,6 +550,14 @@ topology_template:
label: vSON Cluster/DC leader server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_leader_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster/DC leader instances.
@@ -256,18 +566,42 @@ topology_template:
label: vSON DC leader OAM network IP address 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_oam_net_ip_0
type: string
description: Fixed IP assignment for the first vSON DC leader instance on the OAM network.
vson_cll_flavor_name:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
vson_app_server_group_policy:
label: vSON Application server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_app_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Application instances.
@@ -276,18 +610,42 @@ topology_template:
label: vSON DC leader OAM network IP address 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_oam_net_ip_1
type: string
description: Fixed IP assignment for the second vSON DC leader instance on the OAM network.
vson_dcl_oam_net_ip_2:
label: vSON DC leader OAM network IP address 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_oam_net_ip_2
type: string
description: Fixed IP assignment for the third vSON DC leader instance on the OAM network.
vson_dbg_volume_size_0:
label: vSON DBG cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg_volume
+ source_type: HEAT
+ param_name: vson_dbg_volume_size_0
type: float
description: |
Size of the Cinder volume. Measured in gigabytes.
@@ -296,30 +654,71 @@ topology_template:
label: vSON Cluster leader OAM network IP address 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_oam_net_ip_0
type: string
description: Fixed IP assignment for the first vSON Cluster leader instance on the OAM network.
vson_app_oam_net_ip_0:
label: vSON APP OAM network IPv4 address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_oam_net_ip_0
type: string
description: Fixed IPv4 assignment for the vSON APP instance on the OAM network.
vson_cll_oam_net_ip_2:
label: vSON Cluster leader OAM network IP address 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_oam_net_ip_2
type: string
description: Fixed IP assignment for the third vSON Cluster leader instance on the OAM network.
vson_cll_oam_net_ip_1:
label: vSON Cluster leader OAM network IP address 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_oam_net_ip_1
type: string
description: Fixed IP assignment for the second vSON Cluster leader instance on the OAM network.
vson_clm_oam_net_ip_0:
label: vSON CLM OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_9_vson_clm
+ - base_vson
+ source_type: HEAT
+ param_name: vson_clm_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON CLM instance on the OAM network.
default: 172.20.50.3
@@ -327,30 +726,108 @@ topology_template:
label: VF module ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance.
vson_dbc_oam_net_ip_0:
label: vSON DBC OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON DBC instance on the OAM network.
vson_dbg_oam_net_ip_0:
label: vSON DBG OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON DBG instance on the OAM network.
vnf_name:
label: VF name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ - module_0_vson_mgt
+ - module_1_vson_mon_volume
+ - module_1_vson_mon
+ - module_4_vson_dbc_volume
+ - module_4_vson_dbc
+ - module_7_vson_app_volume
+ - module_7_vson_app
+ - module_3_vson_cll_volume
+ - module_3_vson_cll
+ - module_2_vson_mdr_volume
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg_volume
+ - module_5_vson_dbg
+ - module_6_vson_dbs_volume
+ - module_6_vson_dbs
+ - module_8_vson_dcl_volume
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance.
number_of_servers:
label: Number of Servers
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: number_of_servers
type: float
description: Number of vSON Management servers.
constraints:
@@ -361,6 +838,14 @@ topology_template:
label: vSON Management instance name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ source_type: HEAT
+ param_name: vson_mgt_name_0
type: string
description: Unique name to be issued to the vSON Management instance.
default: vson-03.cisco.com
@@ -368,6 +853,33 @@ topology_template:
label: VF module name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ - module_0_vson_mgt
+ - module_1_vson_mon_volume
+ - module_1_vson_mon
+ - module_4_vson_dbc_volume
+ - module_4_vson_dbc
+ - module_7_vson_app_volume
+ - module_7_vson_app
+ - module_3_vson_cll_volume
+ - module_3_vson_cll
+ - module_2_vson_mdr_volume
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg_volume
+ - module_5_vson_dbg
+ - module_6_vson_dbs_volume
+ - module_6_vson_dbs
+ - module_8_vson_dcl_volume
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: Unique name for this VF module instance.
default: module_0_vson_mgt_volume
@@ -375,6 +887,15 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_9_vson_clm
+ - base_vson
+ source_type: HEAT
+ param_name: vson_clm_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-clm-flavor
@@ -382,6 +903,14 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr
+ source_type: HEAT
+ param_name: vson_mdr_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-mdr-flavor
@@ -389,24 +918,80 @@ topology_template:
label: vSON MON Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon
+ source_type: HEAT
+ param_name: vson_mon_volume_id_0
type: string
description: Volume ID of the vSON MON server.
availability_zone_0:
label: Availability zone 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt_volume
+ - module_0_vson_mgt
+ - module_1_vson_mon_volume
+ - module_1_vson_mon
+ - module_4_vson_dbc_volume
+ - module_4_vson_dbc
+ - module_7_vson_app_volume
+ - module_7_vson_app
+ - module_3_vson_cll_volume
+ - module_3_vson_cll
+ - module_2_vson_mdr_volume
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg_volume
+ - module_5_vson_dbg
+ - module_6_vson_dbs_volume
+ - module_6_vson_dbs
+ - module_8_vson_dcl_volume
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Availability zone.
availability_zone_1:
label: Availability zone 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll_volume
+ - module_3_vson_cll
+ - module_6_vson_dbs_volume
+ - module_6_vson_dbs
+ - module_8_vson_dcl_volume
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Second availability zone.
vson_dbc_flavor_name:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-dbc-flavor
@@ -414,48 +999,112 @@ topology_template:
label: vSON DBC volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc_volume
+ source_type: HEAT
+ param_name: vson_dbc_volume_name_0
type: string
description: Volume name.
vson_mdr_image_name:
label: vSON Mediator VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr_volume
+ source_type: HEAT
+ param_name: vson_mdr_image_name
type: string
description: Image name the volume will be created from.
vson_cll_name_0:
label: First vSON Cluster leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_name_0
type: string
description: Unique name to be issued to the first vSON Cluster leader.
vson_cll_image_name:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_image_name
type: string
description: VM Image name the vSON Cluster leader instance will be created from.
vson_cll_name_2:
label: Third vSON Cluster leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_name_2
type: string
description: Unique name to be issued to the third vSON Cluster leader.
vson_dbg_name_0:
label: vSON DBG name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_name_0
type: string
description: Unique name to be issued to the vSON DBG server.
vson_cll_name_1:
label: Second vSON Cluster leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_name_1
type: string
description: Unique name to be issued to the second vSON Cluster leader.
vson_dbs_server_group_policy:
label: vSON Database server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_dbs_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Shard instances.
@@ -464,6 +1113,18 @@ topology_template:
label: vSON join cluster auth token
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_join_cluster_auth_token
type: string
description: "Authentication Token generated for the user permitted to add \
\ a new vSON Datacenter. \n"
@@ -471,42 +1132,117 @@ topology_template:
label: First vSON DC leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_name_0
type: string
description: Unique name to be issued to the first vSON DC leader.
vson_dcl_name_1:
label: Second vSON DC leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_name_1
type: string
description: Unique name to be issued to the second vSON DC leader.
vson_clm_0_oam_net_ip_0:
label: vSON Cluster Manager 0 OAM net IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_clm_0_oam_net_ip_0
type: string
description: IP of the first vSON Cluster Management server.
vson_dcl_name_2:
label: Third vSON DC leader name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_name_2
type: string
description: Unique name to be issued to the third vSON DC leader.
oam_net_id:
label: OAM network ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: The ID of the OAM network.
vson_mon_oam_net_ip_0:
label: vSON MON OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon
+ source_type: HEAT
+ param_name: vson_mon_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON MON instance on the OAM network.
vson_dbg_flavor_name:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-dbg-flavor
@@ -514,6 +1250,15 @@ topology_template:
label: vSON Cluster Manager VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_9_vson_clm
+ - base_vson
+ source_type: HEAT
+ param_name: vson_clm_image_name
type: string
description: Image name the volume will be created from.
default: VSON-BASE-1.0
@@ -521,18 +1266,42 @@ topology_template:
label: vSON DBC name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_name_0
type: string
description: Unique name to be issued to the vSON DBC server.
vson_dbs_oam_net_ip_1:
label: vSON DBS OAM network IP address 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_oam_net_ip_1
type: string
description: Fixed IP assignment for the second vSON DBS instance on the OAM network.
vson_dbg_image_name:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg
+ source_type: HEAT
+ param_name: vson_dbg_image_name
type: string
description: VM Image name the vSON DBG instance will be created from.
default: VSON-BASE-1.0
@@ -540,18 +1309,42 @@ topology_template:
label: vSON MGT OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ source_type: HEAT
+ param_name: vson_mgt_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON MGT instance on the OAM network.
vson_dbs_oam_net_ip_0:
label: vSON DBS OAM network IP address 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_oam_net_ip_0
type: string
description: Fixed IP assignment for the first vSON DBS instance on the OAM network.
vson_cluster_name:
label: vSON Cluster name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_cluster_name
type: string
description: Name of the vSON Cluster.
constraints:
@@ -561,6 +1354,14 @@ topology_template:
label: Cinder volume ID 1 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl_volume
+ source_type: HEAT
+ param_name: vson_dcl_volume_size_1
type: float
description: |
Size of the second Cinder volume. Measured in gigabytes.
@@ -569,6 +1370,14 @@ topology_template:
label: Cinder volume ID 0 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl_volume
+ source_type: HEAT
+ param_name: vson_dcl_volume_size_0
type: float
description: |
Size of the first Cinder volume. Measured in gigabytes.
@@ -577,6 +1386,14 @@ topology_template:
label: Cinder volume ID 2 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl_volume
+ source_type: HEAT
+ param_name: vson_dcl_volume_size_2
type: float
description: |
Size of the third Cinder volume. Measured in gigabytes.
@@ -585,18 +1402,42 @@ topology_template:
label: First vSON DBS name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_name_0
type: string
description: Unique name to be issued to the first vSON DBS server.
vson_dbs_name_1:
label: Second vSON DBS name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_name_1
type: string
description: Unique name to be issued to the second vSON DBS server.
vson_mdr_server_group_id:
label: vSON Mediator server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr
+ source_type: HEAT
+ param_name: vson_mdr_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -606,6 +1447,14 @@ topology_template:
label: vSON DBS server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc
+ source_type: HEAT
+ param_name: vson_dbc_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -615,6 +1464,14 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
default: vson-dbs-flavor
@@ -622,6 +1479,14 @@ topology_template:
label: vSON Mediator server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_mdr_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Mediator instances.
@@ -630,6 +1495,14 @@ topology_template:
label: vSON DBC cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_4_vson_dbc_volume
+ source_type: HEAT
+ param_name: vson_dbc_volume_size_0
type: float
description: Size of the Cinder volume. Measured in gigabytes.
default: 50
@@ -637,6 +1510,14 @@ topology_template:
label: vSON APP instance name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_name_0
type: string
description: Unique name to be issued to the vSON APP instance.
default: vson-13.cisco.com
@@ -644,6 +1525,24 @@ topology_template:
label: Swift account auth token
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: swift_account_auth_token
type: string
description: |
Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0
@@ -651,12 +1550,29 @@ topology_template:
label: vSON MDR OAM network IP address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr
+ source_type: HEAT
+ param_name: vson_mdr_oam_net_ip_0
type: string
description: Fixed IP assignment for the vSON MDR instance on the OAM network.
vson_leader_server_group_id:
label: vSON Cluster leader server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_leader_server_group_id
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Cluster leaders.
@@ -664,6 +1580,14 @@ topology_template:
label: vSON Cluster Manager server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_9_vson_clm
+ source_type: HEAT
+ param_name: vson_clm_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -673,6 +1597,14 @@ topology_template:
label: vSON APP server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_server_group_id
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON APP instances.
@@ -680,6 +1612,14 @@ topology_template:
label: vSON master CLM IP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_master_clm_ip
type: string
description: "Master CLM IP. If the vSON Cluster belongs to a single OpenStack\
\ tenant, the value SHOULD BE EMPTY. In case the vSON Cluster is distributed\
@@ -691,12 +1631,28 @@ topology_template:
label: vSON DC Leader Volume ID 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_volume_id_2
type: string
description: Volume ID of the third vSON DC leader.
vson_mgt_server_group_policy:
label: vSON Management server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_mgt_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON Management instances.
@@ -705,18 +1661,42 @@ topology_template:
label: vSON DC Leader Volume ID 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_volume_id_1
type: string
description: Volume ID of the second vSON DC leader.
vson_dcl_volume_id_0:
label: vSON DC Leader Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_volume_id_0
type: string
description: Volume ID of the first vSON DC leader.
vson_dbs_image_name:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_6_vson_dbs
+ source_type: HEAT
+ param_name: vson_dbs_image_name
type: string
description: VM Image name the vSON DBS instance will be created from.
default: VSON-BASE-1.0
@@ -724,6 +1704,14 @@ topology_template:
label: vSON MON server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon
+ source_type: HEAT
+ param_name: vson_mon_server_group_id
type: string
description: "Tells what policy should be applied to the ServerGroup. Affinity\
\ policy will force instances to share the same hypervisor. Anti-affinity\
@@ -733,6 +1721,14 @@ topology_template:
label: vSON MDR cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr_volume
+ source_type: HEAT
+ param_name: vson_mdr_volume_size_0
type: float
description: Size of the Cinder volume. Measured in gigabytes.
default: 50
@@ -740,18 +1736,52 @@ topology_template:
label: Default gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: default_gateway
type: string
description: Default gateway.
vson_mgt_volume_id_0:
label: vSON Management Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ source_type: HEAT
+ param_name: vson_mgt_volume_id_0
type: string
description: Volume ID of the vSON Management server.
vson_dbg_server_group_policy:
label: vSON Database server group policy
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: vson_dbg_server_group_policy
type: string
description: |
Tells what policy should be applied to the ServerGroup. Affinity policy will force instances to share the same hypervisor. Anti-affinity will force instances to run in different hypervisors. The group intended for vSON DB Global instances.
@@ -760,6 +1790,14 @@ topology_template:
label: vSON MGT volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr_volume
+ source_type: HEAT
+ param_name: vson_mdr_volume_name_0
type: string
description: Volume name.
default: vson_mdr_volume_0
@@ -767,12 +1805,28 @@ topology_template:
label: vSON DBG volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_5_vson_dbg_volume
+ source_type: HEAT
+ param_name: vson_dbg_volume_name_0
type: string
description: Volume name.
vson_app_image_name:
label: vSON base VM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_image_name
type: string
description: VM Image name the vSON APP instance will be created from.
default: VSON-BASE-1.0
@@ -780,24 +1834,74 @@ topology_template:
label: vSON APP Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: vson_app_volume_id_0
type: string
description: Volume ID of the vSON APP server.
vnf_id:
label: VF ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance.
vson_dc_unit:
label: vSON Datacenter name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dc_unit
type: string
description: vSON Datacenter name.
swift_son_container_name:
label: SON Swift
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_vson
+ source_type: HEAT
+ param_name: swift_son_container_name
type: string
description: Swift container storing vSON artifacts.
default: vson
@@ -805,18 +1909,52 @@ topology_template:
label: OAM net IPv6 subnet prefix length
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app
+ source_type: HEAT
+ param_name: oam_net_subnet_v6_prefix_length
type: string
description: OAM network IPv6 subnet prefix length.
vson_cll_volume_id_0:
label: vSON Cluster Leader Volume ID 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_volume_id_0
type: string
description: Volume ID of the first vSON Cluster leader.
ntp_servers:
label: NTP servers
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_0_vson_mgt
+ - module_1_vson_mon
+ - module_4_vson_dbc
+ - module_7_vson_app
+ - module_3_vson_cll
+ - module_2_vson_mdr
+ - module_9_vson_clm
+ - module_5_vson_dbg
+ - module_6_vson_dbs
+ - module_8_vson_dcl
+ - base_vson
+ source_type: HEAT
+ param_name: ntp_servers
type: list
description: List of NTP servers.
entry_schema:
@@ -825,18 +1963,42 @@ topology_template:
label: vSON Cluster Leader Volume ID 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_volume_id_1
type: string
description: Volume ID of the second vSON Cluster leader.
vson_cll_volume_id_2:
label: vSON Cluster Leader Volume ID 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll
+ source_type: HEAT
+ param_name: vson_cll_volume_id_2
type: string
description: Volume ID of the third vSON Cluster leader.
vson_cll_volume_size_2:
label: Cinder volume ID 2 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll_volume
+ source_type: HEAT
+ param_name: vson_cll_volume_size_2
type: float
description: |
Size of the third Cinder volume. Measured in gigabytes.
@@ -844,6 +2006,14 @@ topology_template:
label: Cinder volume ID 1 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll_volume
+ source_type: HEAT
+ param_name: vson_cll_volume_size_1
type: float
description: |
Size of the second Cinder volume. Measured in gigabytes.
@@ -851,6 +2021,14 @@ topology_template:
label: Cinder volume ID 0 size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_3_vson_cll_volume
+ source_type: HEAT
+ param_name: vson_cll_volume_size_0
type: float
description: |
Size of the first Cinder volume. Measured in gigabytes.
@@ -858,24 +2036,56 @@ topology_template:
label: Flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_8_vson_dcl
+ source_type: HEAT
+ param_name: vson_dcl_flavor_name
type: string
description: The ID or name of the flavor to boot onto.
vson_app_volume_name_0:
label: vSON APP volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_7_vson_app_volume
+ source_type: HEAT
+ param_name: vson_app_volume_name_0
type: string
description: Volume name.
vson_mon_name_0:
label: vSON MON instance name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_1_vson_mon
+ source_type: HEAT
+ param_name: vson_mon_name_0
type: string
description: Unique name to be issued to the vSON MON instance.
vson_mdr_name_0:
label: vSON Mediator instance name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - module_2_vson_mdr
+ source_type: HEAT
+ param_name: vson_mdr_name_0
type: string
description: Unique name to be issued to the vSON Mediator instance.
node_templates:
@@ -2243,4 +3453,4 @@ topology_template:
value: vson_dbs_volume_1
vson_mon_server_group_id:
description: ID of the Server Group intended for vSON MON instances.
- value: UNSUPPORTED_RESOURCE_vson_mon_server_group \ No newline at end of file
+ value: UNSUPPORTED_RESOURCE_vson_mon_server_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml
index 7b42e35fa2..27b553bcf2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/MainServiceTemplate.yaml
@@ -11,11 +11,27 @@ topology_template:
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: network name of jsa log 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
node_templates:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
index 52911df941..788f1f05c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -70,6 +126,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -77,6 +141,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -86,34 +158,83 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
oam_image_name:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: PCRF CM image name
default: rhel2
shared_security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: shared_security_group_id2
type: string
description: network name of jsa log network
oam_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -124,6 +245,14 @@ topology_template:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -131,6 +260,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -138,18 +275,43 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
shared_security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: shared_security_group_id1
type: string
description: network name of jsa log network
oam_net_name:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
index 13c01e09ef..dfd135166c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -70,6 +126,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -77,6 +141,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -86,22 +158,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
oam_image_name:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -109,6 +213,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -119,6 +231,14 @@ topology_template:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -126,6 +246,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -133,6 +261,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -140,6 +276,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
@@ -395,4 +539,4 @@ topology_template:
- server_pcm_001
- packet_mirror_network
- compute_port_0
- - abstract_compute \ No newline at end of file
+ - abstract_compute
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index e33c8f7742..0525feb0aa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -70,6 +126,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -77,6 +141,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -86,22 +158,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
oam_image_name:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -109,6 +213,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -119,6 +231,14 @@ topology_template:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -126,6 +246,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -133,6 +261,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -140,6 +276,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
@@ -408,4 +552,4 @@ topology_template:
value:
get_attribute:
- server_pcm_002
- - server_pcm_id \ No newline at end of file
+ - server_pcm_id
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 03d67034c8..f26ec33021 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
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -70,6 +126,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -79,11 +143,27 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -91,6 +171,14 @@ topology_template:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -98,6 +186,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -105,6 +201,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -112,12 +216,28 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
port_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: port_net_name
type: string
node_templates:
server_pcm_001:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
index 7c38cdadd7..91253aebb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -70,6 +126,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -79,22 +143,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -102,6 +198,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -109,6 +213,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -116,6 +228,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml
index d76973cb78..f8113a6083 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -22,6 +30,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -29,6 +45,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -36,6 +60,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -46,6 +78,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -53,6 +93,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -63,6 +111,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -70,6 +126,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -79,22 +143,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -102,6 +198,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -109,6 +213,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -116,6 +228,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
index 4f83013978..d6c80b323c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pd_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -19,6 +27,14 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_ips
type: list
description: OAM network ips
default:
@@ -29,6 +45,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -36,6 +60,14 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -43,6 +75,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -53,6 +93,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -60,6 +108,14 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_ips
type: list
description: CPS network ips
default:
@@ -70,6 +126,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pd_image_name
type: string
description: PCRF CM image name
default: rhel2
@@ -77,6 +141,14 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -84,6 +156,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pd_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -94,6 +174,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_volumes
type: list
description: CPS Cluman Cinder Volume
default:
@@ -103,22 +191,54 @@ topology_template:
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
pcm_flavor_name:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
cps_net_name:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: CPS network name
default: int_pcrf_net_0
@@ -126,6 +246,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -133,6 +261,14 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -140,6 +276,14 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: OAM network name
default: oam_protected_net_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
index 5d4a7a4a82..a42d0d5975 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -19,6 +27,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -26,12 +42,28 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -42,16 +74,40 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
node_templates:
server_pcm_002:
@@ -189,4 +245,4 @@ topology_template:
- server_pcm_002
- server_pcm_001
- server_pcm_003
- - compute_port_0 \ No newline at end of file
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
index 8335140e6c..007c922276 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -19,6 +27,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -26,12 +42,28 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -42,16 +74,40 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
node_templates:
server_pcm_002:
@@ -189,4 +245,4 @@ topology_template:
- server_pcm_002
- server_pcm_001
- server_pcm_003
- - compute_port_0 \ No newline at end of file
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
index 8a54d2838b..29a25e780c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: cps
@@ -19,6 +27,14 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -26,12 +42,28 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: CPS network gateway
pcm_server_names:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -42,16 +74,40 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: PCRF CM image name
default: rhel2
net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: net_name
type: string
compute_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v0.4
+ source_type: HEAT
+ param_name: compute_image_name
type: string
node_templates:
server_pcm_002:
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 9bcbf7f265..69830feadc 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
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 53569c04ff..00c6eeb558 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
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 cfa575c19f..ec6a628f96 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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
@@ -40,6 +72,14 @@ topology_template:
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:
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 b35fcd2d30..806765b626 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
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 32b9d608b7..dd5df2e5cb 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,12 +57,28 @@ topology_template:
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:
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 62c9c11383..d8ed63f516 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,12 +42,28 @@ topology_template:
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
@@ -39,12 +71,28 @@ topology_template:
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:
@@ -56,6 +104,14 @@ topology_template:
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:
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 9bb3ae9ec4..4c33369168 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
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 8e24e4618b..1ec1a4b153 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
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 2c5b6f86b9..dff6ff6335 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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:
@@ -32,6 +48,14 @@ topology_template:
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
@@ -39,6 +63,14 @@ topology_template:
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
@@ -46,6 +78,14 @@ topology_template:
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
@@ -53,6 +93,14 @@ topology_template:
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:
@@ -64,6 +112,14 @@ topology_template:
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
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 dfb0641787..d8244c25d5 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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:
@@ -32,6 +48,14 @@ topology_template:
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
@@ -39,6 +63,14 @@ topology_template:
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
@@ -46,6 +78,14 @@ topology_template:
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
@@ -53,6 +93,14 @@ topology_template:
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:
@@ -64,6 +112,14 @@ topology_template:
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
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 43820275b4..a6d5ed65ce 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 c325682f1b..ce7a4c9e1d 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
@@ -11,41 +11,97 @@ topology_template:
port_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: port_name
type: string
description: port name
default: port_name
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_SCP_id
smp_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: smp_name_1
type: string
description: name of VM
default: vSMP2
flavor_smp_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: flavor_smp_name
type: string
description: SCP SMP Flavor
default: m3.xlarge
image_smp_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: image_smp_name
type: string
description: SCP SMP image
default: asc_base_image_smp
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
default: zone_1
lab_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: lab_name
type: string
description: Lab name
default: Lab-1
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 077dfc9a04..424fcd66ab 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -33,6 +57,14 @@ topology_template:
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
@@ -40,6 +72,14 @@ topology_template:
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
default: packet-net-1
@@ -47,6 +87,14 @@ topology_template:
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:
@@ -58,6 +106,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 482b76338e..0ad20baa65 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
default: 1024
@@ -33,6 +57,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -40,6 +72,14 @@ topology_template:
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
@@ -47,6 +87,14 @@ topology_template:
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
default: packet-net-1
@@ -54,6 +102,14 @@ topology_template:
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:
@@ -65,6 +121,14 @@ topology_template:
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
default: volume_type_1
@@ -72,6 +136,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 055edbcb85..3529fedc3a 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -33,6 +57,14 @@ topology_template:
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
@@ -40,6 +72,14 @@ topology_template:
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
default: packet-net-1
@@ -47,6 +87,14 @@ topology_template:
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:
@@ -58,6 +106,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 5931d1278c..3f3e490da9 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,12 +42,28 @@ topology_template:
label: packet internal 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_internal_network_name
type: string
description: name of the network
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
default: 1024
@@ -39,6 +71,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -46,6 +86,14 @@ topology_template:
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
@@ -53,6 +101,14 @@ topology_template:
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
default: packet-net-1
@@ -60,6 +116,14 @@ topology_template:
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:
@@ -71,6 +135,14 @@ topology_template:
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
default: volume_type_1
@@ -78,6 +150,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 a6938c23d8..e7fa960d3b 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 4715d0e7a8..cdc3fd47ee 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 229c8d96bd..bb44eba9d8 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 5c32464d0e..4f4840d9ba 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 1037ae47b7..e85c75edf4 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 20504bcba2..4054d32d29 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 5d546b60d4..4712348457 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -26,38 +42,94 @@ topology_template:
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
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
description: dummy
lb_st_interface_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
description: dummy
oam_sec_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: oam_sec_group_name
type: string
description: dummy
virtual_ip_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: virtual_ip_address
type: string
description: dummy
nems_traffic_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: nems_traffic_name
type: string
description: dummy
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
@@ -65,6 +137,14 @@ topology_template:
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:
@@ -76,41 +156,105 @@ topology_template:
label: pd_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: pd_security_group_name
type: string
description: pd_security_group_name
jsa_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: jsa_net_name
type: string
description: dummy
pd_port_fixed_ips_address:
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_port_fixed_ips_address
type: string
description: dummy
parent_interface:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: parent_interface
type: string
description: dummy
virtual_ipv6_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: virtual_ipv6_address
type: string
description: dummy
mac_address:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: mac_address
type: string
description: dummy
pd_port_fixed_ips_subnet:
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_port_fixed_ips_subnet
type: string
description: dummy
lb_st_interface_vlan_tag_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: lb_st_interface_vlan_tag_oam
type: string
description: dummy
node_templates:
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 697a93c4d2..e9d7a14899 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 a33dea1421..0feb8ef859 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 07ce00a6e0..83a2eaf23a 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
@@ -12,6 +12,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: packet-net-1
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
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
@@ -33,6 +57,14 @@ topology_template:
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:
@@ -44,6 +76,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 8b195d042a..41f9b91758 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 4295d6f211..d35d65a2d4 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
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
@@ -26,6 +42,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -37,6 +61,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -44,6 +76,14 @@ topology_template:
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
@@ -51,6 +91,14 @@ topology_template:
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:
@@ -62,6 +110,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -72,12 +128,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -85,6 +157,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -92,6 +172,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -103,6 +191,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -110,6 +206,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -117,6 +221,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -124,6 +236,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -131,6 +251,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -145,6 +273,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -152,12 +288,28 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -165,6 +317,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -172,6 +332,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -179,6 +347,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -186,6 +362,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -193,6 +377,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -200,6 +392,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -212,6 +412,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -232,6 +440,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -239,6 +455,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -250,6 +474,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -257,6 +489,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -264,6 +504,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -271,6 +519,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -278,6 +534,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -285,6 +549,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -292,6 +564,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -299,6 +579,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -306,6 +594,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -313,6 +609,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -320,6 +624,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -327,6 +639,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -334,6 +654,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -341,6 +669,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -348,6 +684,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -359,6 +703,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -366,6 +718,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -376,6 +736,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -387,6 +755,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -394,6 +770,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -401,6 +785,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -408,6 +800,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -415,6 +815,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
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 82259a7a1a..8002f73309 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -33,6 +49,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -40,6 +64,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -50,18 +82,42 @@ topology_template:
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
VMME_pd_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: VMME_pd_boot_volume
type: string
default: 49201898-333d-4c88-b58d-cf573b091633
oam_flavor_name:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -69,6 +125,14 @@ topology_template:
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
@@ -76,6 +140,14 @@ topology_template:
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
default: mog_packet_1
@@ -83,6 +155,14 @@ topology_template:
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:
@@ -94,6 +174,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -104,17 +192,41 @@ topology_template:
VMME_ps_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: VMME_ps_boot_volume
type: string
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
VMME_oam_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: VMME_oam_boot_volume
type: string
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
cm_flavor_name:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -122,6 +234,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -129,6 +249,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -136,6 +264,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -143,6 +279,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -156,6 +300,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -163,6 +315,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -170,6 +330,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -181,6 +349,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -188,6 +364,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 927e672add..0bb61d1682 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -33,6 +49,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -40,6 +64,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -50,6 +82,14 @@ topology_template:
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
@@ -57,6 +97,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -64,6 +112,14 @@ topology_template:
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
@@ -71,6 +127,14 @@ topology_template:
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:
@@ -82,6 +146,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -93,6 +165,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -100,6 +180,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -107,6 +195,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -114,6 +210,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -121,6 +225,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -134,6 +246,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -141,6 +261,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -148,6 +276,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -159,6 +295,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -166,6 +310,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 217da7b6a9..7863e55a5b 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -33,6 +49,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -40,6 +64,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -50,6 +82,14 @@ topology_template:
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
@@ -57,6 +97,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -64,6 +112,14 @@ topology_template:
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
@@ -71,6 +127,14 @@ topology_template:
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:
@@ -82,6 +146,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -93,6 +165,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -100,6 +180,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -107,6 +195,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -114,6 +210,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -121,6 +225,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -134,6 +246,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -141,6 +261,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -148,6 +276,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -159,6 +295,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -166,6 +310,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 f379c67f1f..344d34ea74 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -33,6 +49,14 @@ topology_template:
label: csb ineternal cidr
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: csb internal cidr
default: mog_dummy_1
@@ -40,6 +64,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -50,6 +82,14 @@ topology_template:
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
@@ -57,6 +97,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -64,6 +112,14 @@ topology_template:
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
@@ -71,6 +127,14 @@ topology_template:
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:
@@ -82,6 +146,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -93,6 +165,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -100,6 +180,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -107,6 +195,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -114,6 +210,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -121,6 +225,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -134,6 +246,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -141,6 +261,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -148,6 +276,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -159,6 +295,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -166,6 +310,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
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 69ccca59d7..4d445e467c 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -26,6 +42,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -33,6 +57,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -40,6 +72,14 @@ topology_template:
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
@@ -47,6 +87,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -54,6 +102,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -65,6 +121,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -72,6 +136,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -79,6 +151,14 @@ topology_template:
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
@@ -86,6 +166,14 @@ topology_template:
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:
@@ -97,6 +185,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -108,12 +204,28 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -121,6 +233,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -128,6 +248,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -135,6 +263,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -142,6 +278,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -153,6 +297,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -160,6 +312,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -167,6 +327,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -174,6 +342,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -185,6 +361,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -192,6 +376,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -206,6 +398,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -213,6 +413,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -220,6 +428,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -230,6 +446,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -241,12 +465,28 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -254,6 +494,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -261,6 +509,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -268,6 +524,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -275,6 +539,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -282,6 +554,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -289,6 +569,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -296,6 +584,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
@@ -303,6 +599,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -315,6 +619,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -335,6 +647,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -342,6 +662,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
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 d3a239a575..3fe02b86e4 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
@@ -12,6 +12,14 @@ topology_template:
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
@@ -19,6 +27,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -26,6 +42,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -33,6 +57,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -40,6 +72,14 @@ topology_template:
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
@@ -47,6 +87,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -54,6 +102,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -65,6 +121,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -72,6 +136,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -79,6 +151,14 @@ topology_template:
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
@@ -86,6 +166,14 @@ topology_template:
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:
@@ -97,6 +185,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -108,12 +204,28 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -121,6 +233,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -128,6 +248,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -135,6 +263,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -142,6 +278,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -153,6 +297,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -160,6 +312,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -167,6 +327,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -174,6 +342,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -185,6 +361,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -192,6 +376,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -206,6 +398,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -213,6 +413,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -220,6 +428,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -230,6 +446,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -241,12 +465,28 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -254,6 +494,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -261,6 +509,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -268,6 +524,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -275,6 +539,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -282,6 +554,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -289,6 +569,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -296,6 +584,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
@@ -303,6 +599,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -315,6 +619,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -335,6 +647,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -342,6 +662,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
index ec7134b1e0..bc8bf24c56 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml
@@ -13,232 +13,560 @@ topology_template:
label: Internal2_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_name
type: string
description: Internal2_name
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
jsa_cidr:
label: jsa_cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_cidr
type: string
description: jsa_cidr
availabilityzone_name:
label: availabilityzone_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone_name
Internal2_external:
label: Internal2_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_external
type: string
description: Internal2_external
vipr_atm_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: vipr_atm_name_0
type: string
description: prop
Internal2_forwarding_mode:
label: Internal2_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
description: Internal2_forwarding_mode
pcrf_vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_vnf_id
type: string
description: prop
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
fsb1-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: FSB1_internal_mac
pcm_server_name:
label: pcm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_server_name
type: string
description: pcm_server_name
oam_net_name:
label: oam_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: oam_net_name
fsb1-Internal2-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: FSB1_internal_mac
fsb_zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: FSB1_zone
oam_net_gw:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: prop
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: network_name
type: string
description: prop
cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_ip
type: string
description: prop
pcrf_psm_server_name:
label: pcrf_psm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_server_name
type: string
description: pcrf_psm_server_name
pcm_flavor_name:
label: pcm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: pcm_flavor_name
pcrf_cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_ip
type: string
description: prop
fsb2-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: FSB1_internal_mac
pcrf_cps_net_name:
label: pcrf_cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_name
type: string
description: pcrf_cps_net_name
pcm_vol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol
type: string
description: prop
Internal1_external:
label: Internal1_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_external
type: string
description: Internal1_external
Internal1_shared:
label: Internal1_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
description: Internal1_shared
fsb1-name:
label: FSB1_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: FSB1_name
pcm_image_name:
label: pcm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: pcm_image_name
pcrf_psm_flavor_name:
label: pcrf_psm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_flavor_name
type: string
description: pcrf_psm_flavor_name
pcrf_psm_image_name:
label: pcrf_psm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_image_name
type: string
description: pcrf_psm_image_name
snapshot01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot01
type: string
description: prop
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
snapshot02:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot02
type: string
description: prop
Internal2_shared:
label: Internal2_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
description: Internal2_shared
cps_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: prop
Internal1_net_name:
label: Internal1_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
description: Internal1_net_name
fsb1-flavor:
label: FSB1_flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: FSB1_flavor
pcm_vol_01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol_01
type: string
description: prop
volume_type:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
fsb1-zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-zone
type: string
description: FSB1_zone
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -247,49 +575,121 @@ topology_template:
label: jsa_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: jsa_net_name
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: port_name
type: string
description: prop
oam_net_id:
label: oam_net_id
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: oam_net_id
Internal1_forwarding_mode:
label: Internal1_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
description: Internal1_forwarding_mode
cps_net_name:
label: cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: cps_net_name
oam_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_ip
type: string
description: prop
oam_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: prop
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
description: prop
pcrf_security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -346,4 +746,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD)
members:
- VMI1
- - FSB1 \ No newline at end of file
+ - FSB1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml
index 959597787a..746966189d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUC/expectedoutputfiles/MainServiceTemplate.yaml
@@ -15,232 +15,560 @@ topology_template:
label: Internal2_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_name
type: string
description: Internal2_name
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
jsa_cidr:
label: jsa_cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_cidr
type: string
description: jsa_cidr
availabilityzone_name:
label: availabilityzone_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone_name
Internal2_external:
label: Internal2_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_external
type: string
description: Internal2_external
vipr_atm_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: vipr_atm_name_0
type: string
description: prop
Internal2_forwarding_mode:
label: Internal2_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
description: Internal2_forwarding_mode
pcrf_vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_vnf_id
type: string
description: prop
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
fsb1-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: FSB1_internal_mac
pcm_server_name:
label: pcm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_server_name
type: string
description: pcm_server_name
oam_net_name:
label: oam_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: oam_net_name
fsb1-Internal2-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: FSB1_internal_mac
fsb_zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: FSB1_zone
oam_net_gw:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: prop
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: network_name
type: string
description: prop
cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_ip
type: string
description: prop
pcrf_psm_server_name:
label: pcrf_psm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_server_name
type: string
description: pcrf_psm_server_name
pcm_flavor_name:
label: pcm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: pcm_flavor_name
pcrf_cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_ip
type: string
description: prop
fsb2-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: FSB1_internal_mac
pcrf_cps_net_name:
label: pcrf_cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_name
type: string
description: pcrf_cps_net_name
pcm_vol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol
type: string
description: prop
Internal1_external:
label: Internal1_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_external
type: string
description: Internal1_external
Internal1_shared:
label: Internal1_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
description: Internal1_shared
fsb1-name:
label: FSB1_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: FSB1_name
pcm_image_name:
label: pcm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: pcm_image_name
pcrf_psm_flavor_name:
label: pcrf_psm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_flavor_name
type: string
description: pcrf_psm_flavor_name
pcrf_psm_image_name:
label: pcrf_psm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_image_name
type: string
description: pcrf_psm_image_name
snapshot01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot01
type: string
description: prop
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
snapshot02:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot02
type: string
description: prop
Internal2_shared:
label: Internal2_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
description: Internal2_shared
cps_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: prop
Internal1_net_name:
label: Internal1_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
description: Internal1_net_name
fsb1-flavor:
label: FSB1_flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: FSB1_flavor
pcm_vol_01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol_01
type: string
description: prop
volume_type:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
fsb1-zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-zone
type: string
description: FSB1_zone
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -249,49 +577,121 @@ topology_template:
label: jsa_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: jsa_net_name
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: port_name
type: string
description: prop
oam_net_id:
label: oam_net_id
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: oam_net_id
Internal1_forwarding_mode:
label: Internal1_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
description: Internal1_forwarding_mode
cps_net_name:
label: cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: cps_net_name
oam_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_ip
type: string
description: prop
oam_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: prop
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
description: prop
pcrf_security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -347,4 +747,4 @@ topology_template:
members:
- VMI1
- FSB2
- - FSB1 \ No newline at end of file
+ - FSB1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
index c4ac5b14f1..18e0c63df6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml
@@ -19,182 +19,438 @@ topology_template:
label: Internal2_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_name
type: string
description: Internal2_name
Internal1_shared:
label: Internal1_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
description: Internal1_shared
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
jsa_cidr:
label: jsa_cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_cidr
type: string
description: jsa_cidr
availabilityzone_name:
label: availabilityzone_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone_name
fsb1-name:
label: FSB1_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: FSB1_name
pcm_image_name:
label: pcm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_image_name
type: string
description: pcm_image_name
Internal2_external:
label: Internal2_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_external
type: string
description: Internal2_external
Internal2_forwarding_mode:
label: Internal2_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
description: Internal2_forwarding_mode
pcrf_psm_flavor_name:
label: pcrf_psm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_flavor_name
type: string
description: pcrf_psm_flavor_name
pcrf_psm_image_name:
label: pcrf_psm_image_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_image_name
type: string
description: pcrf_psm_image_name
pcrf_vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_vnf_id
type: string
description: prop
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
snapshot01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot01
type: string
description: prop
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
snapshot02:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: snapshot02
type: string
description: prop
fsb1-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: FSB1_internal_mac
Internal2_shared:
label: Internal2_shared
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
description: Internal2_shared
pcm_server_name:
label: pcm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_server_name
type: string
description: pcm_server_name
cps_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_mask
type: string
description: prop
Internal1_net_name:
label: Internal1_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
description: Internal1_net_name
oam_net_name:
label: oam_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: oam_net_name
fsb1-flavor:
label: FSB1_flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: FSB1_flavor
fsb1-Internal2-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: FSB1_internal_mac
pcm_vol_01:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol_01
type: string
description: prop
volume_type:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
fsb1-zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-zone
type: string
description: FSB1_zone
fsb_zone:
label: FSB1_zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: FSB1_zone
oam_net_gw:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_gw
type: string
description: prop
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: network_name
type: string
description: prop
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -202,84 +458,204 @@ topology_template:
cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_ip
type: string
description: prop
jsa_net_name:
label: jsa_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: jsa_net_name
pcrf_psm_server_name:
label: pcrf_psm_server_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_psm_server_name
type: string
description: pcrf_psm_server_name
pcm_flavor_name:
label: pcm_flavor_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_flavor_name
type: string
description: pcm_flavor_name
oam_net_id:
label: oam_net_id
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: oam_net_id
pcrf_cps_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_ip
type: string
description: prop
fsb2-Internal1-mac:
label: FSB1_internal_mac
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: FSB1_internal_mac
Internal1_forwarding_mode:
label: Internal1_forwarding_mode
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
description: Internal1_forwarding_mode
pcrf_cps_net_name:
label: pcrf_cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_cps_net_name
type: string
description: pcrf_cps_net_name
pcm_vol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcm_vol
type: string
description: prop
cps_net_name:
label: cps_net_name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: cps_net_name
type: string
description: cps_net_name
oam_net_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_ip
type: string
description: prop
oam_net_mask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: oam_net_mask
type: string
description: prop
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
description: prop
pcrf_security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: pcrf_security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -288,6 +664,14 @@ topology_template:
label: Internal1_external
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - ep-jsa_net
+ source_type: HEAT
+ param_name: Internal1_external
type: string
description: Internal1_external
node_templates:
@@ -631,4 +1015,4 @@ topology_template:
- pcrf_server_psm
- server_VolumeTest
- FSB2
- - FSB1 \ No newline at end of file
+ - FSB1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml
index cbbf48a430..86c5446952 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedResource/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
label: VF Module ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
default: base
@@ -19,6 +27,14 @@ topology_template:
label: Database Ports
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_ports
type: list
description: List of ports to apply to the security group for the database VMs
default:
@@ -29,6 +45,14 @@ topology_template:
label: Application Protocols
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_protocols
type: list
description: List of protocols associated with the app_ports
default:
@@ -39,6 +63,14 @@ topology_template:
label: Data Volume Size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn_volume
+ source_type: HEAT
+ param_name: db_volume_size_0
type: float
description: Size of the data volume
default: 1
@@ -50,6 +82,14 @@ topology_template:
label: Application Ports
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_ports
type: list
description: List of ports to apply to the security group for the application VMs
default:
@@ -60,6 +100,14 @@ topology_template:
label: VNF ID
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
default: pronghorn
@@ -67,6 +115,14 @@ topology_template:
label: First Availability Zone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the first availability zone
default: nova
@@ -74,6 +130,14 @@ topology_template:
label: Application Public Key
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_public_key
type: string
description: Public ssh key for the application servers
default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGe+nL1U3mFHrbtmsvNWR+oDdUyyOX5KejZqe/80uwDiPNyOJjHWIVuX812AEdAAH94nQnkYr2dBiSu1FPh+auMuk3FfegchKT7pYetqELY3ryLUPEh67PmKrdlT9cQ/wQZROq672AA6qlZAYIooeLZVSzUhABfsITk0RhfcWZGIcZwv0Tja3nnhNgtqCxoTXs6fzfcCaypgwy3F0S4RewUfcz/9g7f0tze1CmWRUtPkNK2nX2/T2AJzHgy+vItwpalnon1egIszJfj7uxp+VotQlQ2PN8sI0J5zgpBFe/lxqEwtIKeiTJ16JlyDXtin/RCjCCdtvIaVCff3Z031UV jspaeth@Jonathons-MBP
@@ -81,6 +145,14 @@ topology_template:
label: Database Image
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_image_name
type: string
description: Image of the database server
default: pronghorn-ubuntu14
@@ -88,6 +160,14 @@ topology_template:
label: Data Volume IDs for disk 3
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_volume_id_3
type: string
description: IDs to be used for the database volumes
default: 454a7b1c-a58f-4bac-bed2-a7afa3836dd4
@@ -95,6 +175,14 @@ topology_template:
label: Data Volume IDs for disk 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_volume_id_2
type: string
description: IDs to be used for the database volumes
default: 6f4d6f1a-1e88-492b-8020-b5a169381434
@@ -102,6 +190,14 @@ topology_template:
label: Database OAM Network
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: Name of the OAM network for the database servers
default: oam
@@ -109,6 +205,14 @@ topology_template:
label: Database Flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_flavor_name
type: string
description: Flavor of the database server
default: s1.test
@@ -116,6 +220,14 @@ topology_template:
label: Data Volume IDs for disk 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_volume_id_1
type: string
description: IDs to be used for the database volumes
default: 5db48c7a-eb2d-4960-a90c-88a2d0052a71
@@ -123,6 +235,14 @@ topology_template:
label: Common Protocols
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: common_protocols
type: list
description: List of protocols associated with the common_ports
default:
@@ -136,6 +256,14 @@ topology_template:
label: Data Volume IDs for disk 0
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_volume_id_0
type: string
description: IDs to be used for the database volumes
default: e8abc8da-f477-4e5c-8266-98b43c982fe4
@@ -143,6 +271,14 @@ topology_template:
label: Database Protocols
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_protocols
type: list
description: List of protocols associated with the db_ports
default:
@@ -153,6 +289,14 @@ topology_template:
label: App Flavor
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_flavor_name
type: string
description: Flavor to be used for the application server
default: s1.test
@@ -160,6 +304,14 @@ topology_template:
label: Application Deployment Timeout
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_deploy_timeout
type: float
description: Timeout in seconds before declaring the application stack as failed
default: 300
@@ -171,6 +323,14 @@ topology_template:
label: Common Ports
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: common_ports
type: list
description: List of ports to apply to the security group for all VMs
default:
@@ -184,6 +344,14 @@ topology_template:
label: Application Hostname
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_name
type: string
description: Hostname of the application server
default: pronghorn-app01
@@ -191,6 +359,14 @@ topology_template:
label: Database Hostname
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_name
type: string
description: Hostname of the database server
default: pronghorn-db01
@@ -198,6 +374,14 @@ topology_template:
label: Application OAM IP Address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_oam_ip_0
type: string
description: OAM IP Address of the application server
default: 10.0.0.21
@@ -205,6 +389,14 @@ topology_template:
label: App VM Role
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_vm_role
type: string
description: Role for the App VM
default: app
@@ -212,6 +404,14 @@ topology_template:
label: App Image
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: app_image_name
type: string
description: Image to be used for the application server
default: pronghorn-ubuntu14
@@ -219,6 +419,14 @@ topology_template:
label: Database Public Key
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_public_key
type: string
description: Public ssh key for the database servers
default: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGe+nL1U3mFHrbtmsvNWR+oDdUyyOX5KejZqe/80uwDiPNyOJjHWIVuX812AEdAAH94nQnkYr2dBiSu1FPh+auMuk3FfegchKT7pYetqELY3ryLUPEh67PmKrdlT9cQ/wQZROq672AA6qlZAYIooeLZVSzUhABfsITk0RhfcWZGIcZwv0Tja3nnhNgtqCxoTXs6fzfcCaypgwy3F0S4RewUfcz/9g7f0tze1CmWRUtPkNK2nX2/T2AJzHgy+vItwpalnon1egIszJfj7uxp+VotQlQ2PN8sI0J5zgpBFe/lxqEwtIKeiTJ16JlyDXtin/RCjCCdtvIaVCff3Z031UV jspaeth@Jonathons-MBP
@@ -226,6 +434,14 @@ topology_template:
label: Database OAM IP Addresse
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_oam_ip_0
type: string
description: OAM IP Address of the database server
default: 10.0.0.20
@@ -233,6 +449,14 @@ topology_template:
label: DB VM Role
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_vm_role
type: string
description: Role for the DB VM
default: database
@@ -240,6 +464,14 @@ topology_template:
label: Database Deployment Timeout
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_pronghorn
+ source_type: HEAT
+ param_name: db_deploy_timeout
type: float
description: Timeout in seconds before declaring the database stack as failed
default: 300
@@ -450,4 +682,4 @@ topology_template:
name: data server group
container_type: host
targets:
- - db_server_group_group \ No newline at end of file
+ - db_server_group_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParam/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParam/expectedoutputfiles/MainServiceTemplate.yaml
index 68059be635..91020444b2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParam/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParam/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,18 +12,42 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
default: dummy_vf_module_id
nimbus_hsl_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: nimbus_hsl_interface_type
type: string
description: service_interface_type for ServiceInstance
default: other
cgi_fw_pt_vlan_VM2_name_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_pt_vlan_VM2_name_fqdn
type: json
description: fqdn of the ServiceInstance in PortTuple Resource
default: [
@@ -31,6 +55,14 @@ topology_template:
cgi_fw_vmi_ecmp_src_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_src_ip
type: boolean
description: source_ip for the VirtualMachineInterface
default: true
@@ -38,6 +70,14 @@ topology_template:
label: Firewall VM Name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_names
type: list
description: Comma Delimited List of Names for ServiceInstance VMs
default:
@@ -48,113 +88,265 @@ topology_template:
cgi_fw_vmi_ecmp_dst_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_dst_ip
type: boolean
description: destination_ip for the VirtualMachineInterface
default: true
sgi_direct_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_interface_type
type: string
description: service_interface_type for ServiceInstance
default: right
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance
default: zrdm3firstnetfcgi02
cgi_fw_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_flavor_name
type: string
description: flavor for the ServiceInstance VM
default: m1.xlarge
vf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: Unique name for this VF Module instance
default: zsde1fcgi02
cgi_fw_st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_type
type: string
description: service_type for the ServiceTemplate
default: firewall
sgi_protected_net_dummy_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:firstnet_dummy_net_1
cgi_fw_vmi_ecmp_src_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_src_port
type: boolean
description: source_port for the VirtualMachineInterface
default: false
sgi_protected_net_dummy1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy1
type: string
description: name for the VirtualNetwork
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
default: dummy_vnf_id
sgi_direct_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:fgi_direct
sgi_protected_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_interface_type
type: string
description: service_interface_type for ServiceInstance
default: left
cgi_fw_vmi_ecmp_dst_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_dst_port
type: boolean
description: destination_port for the VirtualMachineInterface
default: false
sgi_direct_family_v6:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_family_v6
type: string
description: IP Family Address for InstanceIp
default: v6
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availability_zone for the ServiceInstance
default: nova
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: availability_zone for the ServiceInstance
default: nova
nimbus_hsl_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: nimbus_hsl_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:alu-firstnet-net
sgi_protected_net_dummy:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy
type: string
description: name for the VirtualNetwork
default: firstnet_dummy_net_1
cgi_fw_pt_vlan_VM1_name_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_pt_vlan_VM1_name_fqdn
type: json
description: fqdn of the ServiceInstance in PortTuple Resource
default: [
@@ -162,56 +354,136 @@ topology_template:
cgi_fw_vmi_ecmp_configured:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_configured
type: boolean
description: hashing_configured for the VirtualMachineInterface
default: true
cgi_fw_vmi_ecmp_ip_protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_ip_protocol
type: boolean
description: ip_protocol for the VirtualMachineInterface
default: false
oam_protected_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: oam_protected_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:alu_l3_mt_net
oam_protected_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: oam_protected_interface_type
type: string
description: service_interface_type for ServiceInstance
default: management
cgi_fw_st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_mode
type: string
description: service_mode for the ServiceTemplate
default: in-network-nat
sgi_direct_ipv6_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_ipv6_subnet_id
type: string
description: Subnet UUID for InstanceIp
default: 4560666e-f306-4d7b-b0ec-a2d4330e9600
contrail_vmi_subinterface:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: contrail_vmi_subinterface
type: string
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: port_name
type: string
cgi_fw_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_image_name
type: string
description: image_name for the ServiceInstance VM
default: F5_LB-FW_F5_12_1_HF1_Startup
cgi_fw_oam_protected_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_oam_protected_ips
type: list
description: the ips of the management network for CGI FW
default:
@@ -222,18 +494,42 @@ topology_template:
sgi_direct_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_subnet_id
type: string
description: Subnet UUID for InstanceIp
default: 63858a9d-696b-4731-b3b3-7c8dfd777b9e
domain:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: domain
type: string
description: domain for the ServiceTemplate
default: default-domain
cgi_fw_st_version:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_version
type: float
description: version for the ServiceTemplate
default: 2
@@ -244,12 +540,28 @@ topology_template:
cgi_fw_st_virtualization_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_virtualization_type
type: string
description: service_virtualization_type for the ServiceTemplate
default: virtual-machine
subinterface_name_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: subinterface_name_prefix
type: string
node_templates:
CGI_FW_OAM_PROTECTED_RVMI_2:
@@ -767,4 +1079,4 @@ topology_template:
get_input: vnf_name
container_type: host
targets:
- - CGI_FW_RAG_group \ No newline at end of file
+ - CGI_FW_RAG_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml
index d45c614cfc..b75984fcd4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrDynamicParamEmptyMap/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
access_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: access_cidr
type: string
description: CIDR associated with tag "access".
default: 37.9.0.32/27
@@ -19,12 +27,28 @@ topology_template:
oam_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_default_gateway
type: string
description: Default gateway IP address associated with tag "oam".
default: 127.0.0.1
int_vlan_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: int_vlan_id
type: string
description: Optional VLAN associated with the (0th) internal network.
default: ''
@@ -33,6 +57,14 @@ topology_template:
v4_ntp_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v4_ntp_server
type: string
description: |
(optional) IPV4 NTP server list.
@@ -42,24 +74,56 @@ topology_template:
access_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: access_subnet_id
type: string
description: ID of the subnet associated with tag "access".
default: 050ad34a-47a3-48a9-9761-12eff354fd4f
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VNF instance.
default: MYvnf_name
access_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: access_default_gateway
type: string
description: Default gateway IP address associated with tag "access".
default: 37.9.0.62
ims_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: ims_flavor_name
type: string
description: CDL of IMS flavor values.
default: LCP-1-4-15x2-4
@@ -68,6 +132,14 @@ topology_template:
oam_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_cidr
type: string
description: CIDR associated with tag "oam".
default: 127.0.0.1/27
@@ -76,6 +148,14 @@ topology_template:
vm_counts:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vm_counts
type: json
description: |
Maps VM type tags to the number of pairs of that type.
@@ -85,6 +165,14 @@ topology_template:
oam_oam_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_oam_ips
type: list
description: List of IP addresses for this VMtype_NETtype combination.
default:
@@ -97,6 +185,14 @@ topology_template:
v6_dns_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v6_dns_server
type: string
description: |
(optional) IPV6 DNS server list.
@@ -106,6 +202,14 @@ topology_template:
v6_ntp_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v6_ntp_server
type: string
description: |
(optional) IPV6 NTP server list.
@@ -115,12 +219,28 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance.
default: MYvnf_id
lcm_keypair:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: lcm_keypair
type: string
description: Keypair used for lifecycle management access.
default: ''
@@ -129,24 +249,56 @@ topology_template:
oam_management_v6_index:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_management_v6_index
type: float
description: Index to the V6 management IP address.
default: 0
oam_management_v4_index:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_management_v4_index
type: float
description: Index to the V4 management IP address.
default: 1
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Availability zone name.
default: zone2
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Availability zone name.
default: zone1
@@ -156,18 +308,42 @@ topology_template:
oam_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_subnet_id
type: string
description: ID of the subnet associated with tag "oam".
default: 37d36cb0-54b7-4fbf-bc45-4879da03a0db
oam_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_image_name
type: string
description: Image for this VMtype.
default: drew34.20
net_types:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: net_types
type: list
description: CDL of subnet tags.
default:
@@ -178,6 +354,14 @@ topology_template:
ssh_access_key:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: ssh_access_key
type: string
description: |
Optional SSH public key value for lifecycle management
@@ -186,6 +370,14 @@ topology_template:
ims_access_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: ims_access_ips
type: list
description: List of IP addresses for this VMtype_NETtype combination.
default:
@@ -196,6 +388,14 @@ topology_template:
v4_enum_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v4_enum_server
type: string
description: |
(optional) IPV4 ENUM server list.
@@ -205,6 +405,14 @@ topology_template:
oam_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_flavor_name
type: string
description: CDL of OAM flavor values.
default: LCP-2-4-25x2-4
@@ -213,12 +421,28 @@ topology_template:
vnf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vnf_module_id
type: string
description: Unique ID for this VNF Module instance.
default: MYvnf_module_id
access_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: access_net_id
type: string
description: ID of the network associated with tag "access".
default: 870909b5-d933-4a95-9aff-df38523c37ed
@@ -227,6 +451,14 @@ topology_template:
backup_file:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: backup_file
type: string
description: |
<cURL path>/<backup file>
@@ -237,6 +469,14 @@ topology_template:
v6_enum_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v6_enum_server
type: string
description: |
(optional) IPV6 ENUM server list.
@@ -246,6 +486,14 @@ topology_template:
ims_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: ims_names
type: list
description: CDL of IMS VM names.
default:
@@ -256,6 +504,14 @@ topology_template:
default_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: default_action
type: string
description: |
Default action for all VMs. This may be overridden for
@@ -272,6 +528,14 @@ topology_template:
v4_dns_server:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: v4_dns_server
type: string
description: |
(optional) IPV4 DNS server list.
@@ -281,12 +545,28 @@ topology_template:
oam_management_v6_source:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_management_v6_source
type: string
description: Name of the OAM IP parameter to use.
default: ''
oam_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: ID of the network associated with tag "oam".
default: 7410cc1d-c421-41b3-adef-d46cf79cb8d9
@@ -295,18 +575,42 @@ topology_template:
oam_management_v4_source:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_management_v4_source
type: string
description: Name of the OAM IP parameter to use.
default: oam_oam_ips
ims_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: ims_image_name
type: string
description: Image for this VMtype.
default: drew34.20
install_config:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: install_config
type: string
description: JSON formatted string of install config values.
default: ' "application_name": "5450_isc", "license_reference": "test_license",
@@ -326,12 +630,28 @@ topology_template:
cloud_name_delimiter:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: cloud_name_delimiter
type: string
description: Separator for cloud resource naming.
default: '-'
oam_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: oam_names
type: list
description: CDL of OAM VM names.
default:
@@ -342,12 +662,28 @@ topology_template:
vnf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vnf_module_name
type: string
description: Unique name for this VNF module instance.
default: base_module
vm_info:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_mso
+ source_type: HEAT
+ param_name: vm_info
type: json
description: Provides keys into type-specific parameters and vnic info.
default: {
@@ -693,4 +1029,4 @@ topology_template:
value:
get_input:
- get_input: oam_management_v6_source
- - get_input: oam_management_v6_index \ No newline at end of file
+ - get_input: oam_management_v6_index
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrNestedAtt/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrNestedAtt/expectedoutputfiles/MainServiceTemplate.yaml
index 12d8824d57..589d2b568d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrNestedAtt/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttrNestedAtt/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,18 +12,42 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: Unique ID for this VF Module instance
default: dummy_vf_module_id
nimbus_hsl_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: nimbus_hsl_interface_type
type: string
description: service_interface_type for ServiceInstance
default: other
cgi_fw_pt_vlan_VM2_name_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_pt_vlan_VM2_name_fqdn
type: json
description: fqdn of the ServiceInstance in PortTuple Resource
default: [
@@ -31,6 +55,14 @@ topology_template:
cgi_fw_vmi_ecmp_src_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_src_ip
type: boolean
description: source_ip for the VirtualMachineInterface
default: true
@@ -38,6 +70,14 @@ topology_template:
label: Firewall VM Name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_names
type: list
description: Comma Delimited List of Names for ServiceInstance VMs
default:
@@ -48,113 +88,265 @@ topology_template:
cgi_fw_vmi_ecmp_dst_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_dst_ip
type: boolean
description: destination_ip for the VirtualMachineInterface
default: true
sgi_direct_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_interface_type
type: string
description: service_interface_type for ServiceInstance
default: right
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VF instance
default: zrdm3firstnetfcgi02
cgi_fw_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_flavor_name
type: string
description: flavor for the ServiceInstance VM
default: m1.xlarge
vf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: Unique name for this VF Module instance
default: zsde1fcgi02
cgi_fw_st_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_type
type: string
description: service_type for the ServiceTemplate
default: firewall
sgi_protected_net_dummy_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:firstnet_dummy_net_1
cgi_fw_vmi_ecmp_src_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_src_port
type: boolean
description: source_port for the VirtualMachineInterface
default: false
sgi_protected_net_dummy1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy1
type: string
description: name for the VirtualNetwork
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VF instance
default: dummy_vnf_id
sgi_direct_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:fgi_direct
sgi_protected_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_interface_type
type: string
description: service_interface_type for ServiceInstance
default: left
cgi_fw_vmi_ecmp_dst_port:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_dst_port
type: boolean
description: destination_port for the VirtualMachineInterface
default: false
sgi_direct_family_v6:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_family_v6
type: string
description: IP Family Address for InstanceIp
default: v6
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availability_zone for the ServiceInstance
default: nova
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: availability_zone for the ServiceInstance
default: nova
nimbus_hsl_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: nimbus_hsl_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:alu-firstnet-net
sgi_protected_net_dummy:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_protected_net_dummy
type: string
description: name for the VirtualNetwork
default: firstnet_dummy_net_1
cgi_fw_pt_vlan_VM1_name_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_pt_vlan_VM1_name_fqdn
type: json
description: fqdn of the ServiceInstance in PortTuple Resource
default: [
@@ -162,56 +354,136 @@ topology_template:
cgi_fw_vmi_ecmp_configured:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_configured
type: boolean
description: hashing_configured for the VirtualMachineInterface
default: true
cgi_fw_vmi_ecmp_ip_protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_vmi_ecmp_ip_protocol
type: boolean
description: ip_protocol for the VirtualMachineInterface
default: false
oam_protected_net_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: oam_protected_net_fqdn
type: string
description: fq_name for the VirtualNetwork
default: default-domain:ALU-L3:alu_l3_mt_net
oam_protected_interface_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: oam_protected_interface_type
type: string
description: service_interface_type for ServiceInstance
default: management
cgi_fw_st_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_mode
type: string
description: service_mode for the ServiceTemplate
default: in-network-nat
sgi_direct_ipv6_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_ipv6_subnet_id
type: string
description: Subnet UUID for InstanceIp
default: 4560666e-f306-4d7b-b0ec-a2d4330e9600
contrail_vmi_subinterface:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: contrail_vmi_subinterface
type: string
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: port_name
type: string
cgi_fw_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_image_name
type: string
description: image_name for the ServiceInstance VM
default: F5_LB-FW_F5_12_1_HF1_Startup
cgi_fw_oam_protected_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_oam_protected_ips
type: list
description: the ips of the management network for CGI FW
default:
@@ -222,18 +494,42 @@ topology_template:
sgi_direct_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: sgi_direct_subnet_id
type: string
description: Subnet UUID for InstanceIp
default: 63858a9d-696b-4731-b3b3-7c8dfd777b9e
domain:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: domain
type: string
description: domain for the ServiceTemplate
default: default-domain
cgi_fw_st_version:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_version
type: float
description: version for the ServiceTemplate
default: 2
@@ -244,12 +540,28 @@ topology_template:
cgi_fw_st_virtualization_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: cgi_fw_st_virtualization_type
type: string
description: service_virtualization_type for the ServiceTemplate
default: virtual-machine
subinterface_name_prefix:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base_firstnet_fgi_frwl
+ source_type: HEAT
+ param_name: subinterface_name_prefix
type: string
node_templates:
CGI_FW_OAM_PROTECTED_RVMI_2:
@@ -638,4 +950,4 @@ topology_template:
get_input: vnf_name
container_type: host
targets:
- - CGI_FW_RAG_group \ No newline at end of file
+ - CGI_FW_RAG_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/MainServiceTemplate.yaml
index bb49284131..c8e20657c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,47 +11,111 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: VF Module ID
default: '888800008888'
cpm_mgt_gw_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_gw_ip
type: string
description: Default Gateway for the Management Interface, set during boot time
default: 192.168.254.1
mgt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: mgt_net_id
type: string
description: Network used by the Management interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e101
ctrl_fabric_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_cidr
type: string
description: CIDR of Control Fabric Network
data3_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data3_subnet_id
type: string
description: Subnet used by the fourth Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b106
ctrl_fabric_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_net_id
type: string
description: Network used by the control fabric interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e102
data0_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data0_subnet_id
type: string
description: Subnet used by the Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b103
cpmaSlot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpmaSlot
type: string
description: The slot value assigned to CPMA
default: A
@@ -61,18 +125,42 @@ topology_template:
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: VNF ID
default: '111100001111'
cpm_mgt_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_ip_1
type: string
description: Fixed IP that will be used by the Management Interface on CPMB
default: 192.168.254.12
cpm_smbios:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_smbios
type: string
description: Parameters to be passed to the CPM at boot up as key-value pairs
default: 'TiMOS: slot=$slt chassis=VSR card=cpm-v license-file=license.txt address=$adrp/24@active
@@ -80,18 +168,42 @@ topology_template:
cpm_mgt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_ip_0
type: string
description: Fixed IP that will be used by the Management Interface on CPMA
default: 192.168.254.11
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Availability zone where this component should be instantiated
default: nova
cpm_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_name_1
type: string
description: VM name for CPM B
default: vbng1-cpmb
@@ -101,90 +213,210 @@ topology_template:
cpm_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_flavor_name
type: string
description: Flavor of the CPM VNF to be used
default: m1.medium
data2_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data2_subnet_id
type: string
description: Subnet used by the third Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b105
cpm_mtu:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mtu
type: string
description: MTU size in bytes
default: '9000'
cpm_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_name_0
type: string
description: VM name for CPM A
default: vbng1-cpma
iom_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_image_name
type: string
description: Image to be used for the IOM instance
default: VSR-14.0R4
iom1Slot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom1Slot
type: string
description: The slot value assigned to IOM1
default: '1'
iom_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_flavor_name
type: string
description: Flavor of the IOM VNF to be used
default: m1.medium
iom_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_name_0
type: string
description: VM name for IOM 1
default: vbng1-iom1
data1_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data1_net_id
type: string
description: Network used by the second Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e104
cpm_mgt_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_cidr
type: string
description: Management network to be used by CPM
default: 192.168.254.0/24
mgt_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: mgt_subnet_id
type: string
description: Subnet used by the Management interface
default: 90ad7ea9-596f-45f4-8869-226fc876b101
ctrl_fabric_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_subnet_id
type: string
description: Subnet used by the control fabric interface
default: 90ad7ea9-596f-45f4-8869-226fc876b102
data0_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data0_net_id
type: string
description: Network used by the Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e103
data2_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data2_net_id
type: string
description: Network used by the third Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e105
iom_mtu:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_mtu
type: string
description: MTU size in bytes
default: '9000'
@@ -194,36 +426,84 @@ topology_template:
cpm_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_image_name
type: string
description: Image to be used for the CPM instance
default: VSR-14.0R4
cpmbSlot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpmbSlot
type: string
description: The slot value assigned to CPMB
default: B
iom_smbios:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_smbios
type: string
description: Parameters to be passed to the IOM at boot up as key-value pairs
default: 'TiMOS: slot=$slt chassis=VSR card=iom-v mda/1=m20-v features=795'
data3_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data3_net_id
type: string
description: Network used by the fourth Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e106
data1_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data1_subnet_id
type: string
description: Subnet used by the second Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b104
stack_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: stack_name
type: string
description: Name of the HEAT stack
default:
@@ -457,4 +737,4 @@ topology_template:
outputs:
out1:
value:
- get_input: OS::project_id \ No newline at end of file
+ get_input: OS::project_id
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/MainServiceTemplate.yaml
index 5b6cde14cb..8d7c00b682 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,65 +11,153 @@ topology_template:
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: VF Module ID
default: '888800008888'
cpm_mgt_gw_ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_gw_ip
type: string
description: Default Gateway for the Management Interface, set during boot time
default: 192.168.254.1
mgt_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: mgt_net_id
type: string
description: Network used by the Management interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e101
ctrl_fabric_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_cidr
type: string
description: CIDR of Control Fabric Network
data3_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data3_subnet_id
type: string
description: Subnet used by the fourth Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b106
ctrl_fabric_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_net_id
type: string
description: Network used by the control fabric interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e102
data0_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data0_subnet_id
type: string
description: Subnet used by the Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b103
cpmaSlot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpmaSlot
type: string
description: The slot value assigned to CPMA
default: A
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: VNF ID
default: '111100001111'
cpm_mgt_ip_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_ip_1
type: string
description: Fixed IP that will be used by the Management Interface on CPMB
default: 192.168.254.12
cpm_smbios:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_smbios
type: string
description: Parameters to be passed to the CPM at boot up as key-value pairs
default: 'TiMOS: slot=$slt chassis=VSR card=cpm-v license-file=license.txt address=$adrp/24@active
@@ -77,18 +165,42 @@ topology_template:
cpm_mgt_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_ip_0
type: string
description: Fixed IP that will be used by the Management Interface on CPMA
default: 192.168.254.11
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Availability zone where this component should be instantiated
default: nova
cpm_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_name_1
type: string
description: VM name for CPM B
default: vbng1-cpmb
@@ -98,126 +210,294 @@ topology_template:
cpm_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_flavor_name
type: string
description: Flavor of the CPM VNF to be used
default: m1.medium
data2_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data2_subnet_id
type: string
description: Subnet used by the third Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b105
cpm_mtu:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mtu
type: string
description: MTU size in bytes
default: '9000'
cpm_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_name_0
type: string
description: VM name for CPM A
default: vbng1-cpma
iom_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_image_name
type: string
description: Image to be used for the IOM instance
default: VSR-14.0R4
iom1Slot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom1Slot
type: string
description: The slot value assigned to IOM1
default: '1'
iom_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_flavor_name
type: string
description: Flavor of the IOM VNF to be used
default: m1.medium
iom_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_name_0
type: string
description: VM name for IOM 1
default: vbng1-iom1
data1_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data1_net_id
type: string
description: Network used by the second Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e104
cpm_mgt_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_mgt_cidr
type: string
description: Management network to be used by CPM
default: 192.168.254.0/24
mgt_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: mgt_subnet_id
type: string
description: Subnet used by the Management interface
default: 90ad7ea9-596f-45f4-8869-226fc876b101
ctrl_fabric_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: ctrl_fabric_subnet_id
type: string
description: Subnet used by the control fabric interface
default: 90ad7ea9-596f-45f4-8869-226fc876b102
data0_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data0_net_id
type: string
description: Network used by the Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e103
data2_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data2_net_id
type: string
description: Network used by the third Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e105
iom_mtu:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_mtu
type: string
description: MTU size in bytes
default: '9000'
cpm_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpm_image_name
type: string
description: Image to be used for the CPM instance
default: VSR-14.0R4
cpmbSlot:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: cpmbSlot
type: string
description: The slot value assigned to CPMB
default: B
iom_smbios:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: iom_smbios
type: string
description: Parameters to be passed to the IOM at boot up as key-value pairs
default: 'TiMOS: slot=$slt chassis=VSR card=iom-v mda/1=m20-v features=795'
data3_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data3_net_id
type: string
description: Network used by the fourth Data interface
default: 1024b82c-0049-4503-8b0b-eb5ff952e106
data1_subnet_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: data1_subnet_id
type: string
description: Subnet used by the second Data interface
default: 90ad7ea9-596f-45f4-8869-226fc876b104
stack_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - VSR_base_hot
+ source_type: HEAT
+ param_name: stack_name
type: string
description: Name of the HEAT stack
default:
@@ -445,4 +725,4 @@ topology_template:
- IOM1
- sec_group
- CPMB
- - CPMA \ No newline at end of file
+ - CPMA
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml
index 04184064bd..5e329f9448 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml
@@ -21,6 +21,14 @@ topology_template:
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
@@ -28,6 +36,14 @@ topology_template:
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
@@ -35,6 +51,14 @@ topology_template:
label: repl network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: repl_net_ips
type: list
description: ips of repl network
default:
@@ -46,6 +70,14 @@ topology_template:
label: silver lining 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: sl_net_name
type: string
description: id of the sl network
default: exn_protected_net_0
@@ -53,6 +85,14 @@ topology_template:
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
@@ -60,6 +100,14 @@ topology_template:
label: mog Config script 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: mog_script_name
type: string
description: Config script name
default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer/mog-cloudinit.sh
@@ -67,6 +115,14 @@ topology_template:
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:
@@ -78,6 +134,14 @@ topology_template:
label: SM 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: sm_server_names
type: list
description: name of the SM instance
default:
@@ -88,12 +152,28 @@ topology_template:
dummy_net_netmask_1:
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_netmask_1
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
dummy_net_netmask_0:
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_netmask_0
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -101,6 +181,14 @@ topology_template:
label: mog ran net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_floating_ip
type: string
description: mog ran net virtual ip
default: 107.239.36.5
@@ -108,6 +196,14 @@ topology_template:
label: RAN network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: ran_net_ips
type: list
description: RAN network ip
default:
@@ -119,6 +215,14 @@ topology_template:
label: csb internal end
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_end_0
type: string
description: csb internal end
default: 169.254.1.254
@@ -126,6 +230,14 @@ topology_template:
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: oam_image_name
type: string
description: OAM image name
default: MOG_BASE_8.0
@@ -133,6 +245,14 @@ topology_template:
label: csb internal end
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_end_1
type: string
description: csb internal end
default: 169.254.2.254
@@ -140,6 +260,14 @@ topology_template:
label: oam 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: oam_net_name
type: string
description: name of the oam network
default: oam_protected_net_0
@@ -147,6 +275,14 @@ topology_template:
label: internet network ips
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_ips
type: list
description: ip of the OAM network
default:
@@ -161,6 +297,14 @@ topology_template:
label: RAN 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: ran_net_name
type: string
description: RAN network name
default: gn_direct_net_0
@@ -168,6 +312,14 @@ topology_template:
label: mog-cm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-1
type: string
description: Cluster Manager volume 1
default: 43ccf5ba-2d50-427b-a38f-e8c7d8670eee
@@ -175,12 +327,28 @@ topology_template:
label: mog-cm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: cluster-manager-vol-2
type: string
description: Cluster Manager volume 2 with ISO image
default: 6f92e211-2d61-487d-8f84-d2d00cea3698
csb_net_netmask:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_netmask
type: string
description: CSB internal network subnet mask
default: 255.255.255.0
@@ -188,6 +356,14 @@ topology_template:
label: OAM 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: oam_flavor_name
type: string
description: flavor name of OAM instance
default: m3.xlarge
@@ -195,6 +371,14 @@ topology_template:
label: csb internal start
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_start_0
type: string
description: csb internal start
default: 169.254.1.4
@@ -202,6 +386,14 @@ topology_template:
label: csb internal start
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_start_1
type: string
description: csb internal start
default: 169.254.2.4
@@ -209,6 +401,14 @@ topology_template:
label: CM 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: cm_flavor_name
type: string
description: flavor name of CM instance
default: m3.xlarge
@@ -216,6 +416,14 @@ topology_template:
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: sm_image_name
type: string
description: SM image name
default: MOG_BASE_8.0
@@ -223,6 +431,14 @@ topology_template:
label: mog script parameter 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: mog_parameter_name
type: string
description: Config script parameter csv file name
default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer
@@ -230,6 +446,14 @@ topology_template:
label: PS 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 PS instance
default:
@@ -242,6 +466,14 @@ topology_template:
csb_net_ips:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_ips
type: list
description: mog_csb_net IP addresses
default:
@@ -262,6 +494,14 @@ topology_template:
label: PS 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 PS instance
default: m3.xlarge
@@ -269,6 +509,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_ips
type: list
description: Rx network ips
default:
@@ -280,6 +528,14 @@ topology_template:
label: csb internal 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: dummy_net_name_1
type: string
description: csb internal network name
default: mog_dummy_1
@@ -287,6 +543,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_1
type: string
description: csb internal cidr
default: 169.254.2.0/24
@@ -294,6 +558,14 @@ topology_template:
label: csb internal 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: dummy_net_name_0
type: string
description: csb internal network name
default: mog_dummy_0
@@ -301,6 +573,14 @@ topology_template:
label: csb ineternal cidr
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_cidr_0
type: string
description: csb internal cidr
default: 169.254.1.0/24
@@ -308,6 +588,14 @@ topology_template:
label: mog Config URL
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: mog_swift_container
type: string
description: Config URL
default: http://10.147.38.210:8080/v1/AUTH_8e501b8121f34a6eaaf526d3305985cc/mogtestcontainer
@@ -315,6 +603,14 @@ topology_template:
label: mog-oam-vol-2
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-vol-2
type: string
description: OAM volume 2
default: 6d169cb6-6ddc-41dc-920c-2839898a2924
@@ -322,6 +618,14 @@ topology_template:
label: mog sl net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_floating_ip
type: string
description: mog sl net virtual ip
default: 107.239.45.6
@@ -329,6 +633,14 @@ topology_template:
label: mog-sm-vol-1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-1
type: string
description: Session Manager volume 1
default: 49201898-333d-4c88-b58d-cf573b091633
@@ -336,6 +648,14 @@ topology_template:
label: mog rx net virtual ip
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: rx_net_floating_ip
type: string
description: mog rx net virtual ip
default: 107.239.34.5
@@ -343,6 +663,14 @@ topology_template:
label: mog-sm-vol-2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: session-manager-vol-2
type: string
description: Session Manager volume 2
default: 4c35b5f1-ce99-4220-a6e2-cda6e2d713a0
@@ -350,6 +678,14 @@ topology_template:
label: mog-oam-vol-1
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-vol-1
type: string
description: OAM volume 1
default: 0a7fcd9e-2624-401d-ac21-b0191f85ec77
@@ -357,6 +693,14 @@ topology_template:
label: csb internal start
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_start
type: string
description: csb internal start
default: 172.26.0.1
@@ -364,6 +708,14 @@ topology_template:
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: cm_image_name
type: string
description: CM image name
default: MOG_BASE_8.0
@@ -371,6 +723,14 @@ topology_template:
label: SM 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: sm_flavor_name
type: string
description: flavor name of SM instance
default: m2.xlarge4
@@ -378,6 +738,14 @@ topology_template:
label: PS 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: PS image name
default: MOG_BASE_8.0
@@ -385,6 +753,14 @@ topology_template:
label: OAM 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: oam_server_names
type: list
description: name of the OAM instance
default:
@@ -396,6 +772,14 @@ topology_template:
label: csb ineternal cidr
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_cidr
type: string
description: csb internal cidr
default: 172.26.0.0/24
@@ -403,6 +787,14 @@ topology_template:
label: CM 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: cm_server_names
type: list
description: name of the CM instance
default:
@@ -413,6 +805,14 @@ topology_template:
label: silver lining network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: sl_net_ips
type: list
description: ips of the sl network
default:
@@ -424,6 +824,14 @@ topology_template:
label: Rx 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: rx_net_name
type: string
description: Rx network name
default: cor_direct_net_1
@@ -431,6 +839,14 @@ topology_template:
label: Replication 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: repl_net_name
type: string
description: name of the replication network
default: cor_direct_net_0
@@ -438,6 +854,14 @@ topology_template:
label: 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
description: the name of security group
default: mog_security_group
@@ -445,6 +869,14 @@ topology_template:
label: csb internal end
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: csb_net_end
type: string
description: csb internal end
default: 172.26.0.254
@@ -452,6 +884,14 @@ topology_template:
label: csb internal 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: csb_net_name
type: string
description: csb internal network name
default: int_mog_csb_net
@@ -459,6 +899,14 @@ topology_template:
label: mog Config script directory
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-mog-0108-bs1271
+ source_type: HEAT
+ param_name: mog_script_dir
type: string
description: Config script directory
default: /root
@@ -1715,4 +2163,4 @@ topology_template:
properties:
container_type: host
targets:
- - servergroup_mog02_group \ No newline at end of file
+ - servergroup_mog02_group
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/MainServiceTemplate.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/MainServiceTemplate.yaml
index 3a0b1239a2..681aa78d01 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/MainServiceTemplate.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/MainServiceTemplate.yaml
@@ -12,6 +12,18 @@ topology_template:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: availabilityzone_name
type: string
description: availabilityzone name
default: nova
@@ -19,6 +31,14 @@ topology_template:
label: Sgi Sy network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sgi_sy_net_ips
type: list
description: Sgi Sy network ips
default:
@@ -32,6 +52,14 @@ topology_template:
label: PCRF PD server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_ppd_server_names
type: list
description: name of the PCRF PD instance
default:
@@ -45,6 +73,14 @@ topology_template:
label: Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_vol_size
type: float
description: the size of the Cinder volume
default: 500
@@ -52,6 +88,14 @@ topology_template:
label: OAM volume name 2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_vol_name_2
type: string
description: Assigning name to volume
default: sde1-pcrfx01-oam001-vol-2
@@ -59,6 +103,14 @@ topology_template:
label: PCRF PS flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pps_v1.0
+ source_type: HEAT
+ param_name: pcrf_pps_flavor_name
type: string
description: flavor name of PCRF PS instance
default: lc.3xlarge
@@ -66,6 +118,14 @@ topology_template:
label: PCRF SM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-psm_v1.0
+ source_type: HEAT
+ param_name: pcrf_psm_server_names
type: list
description: name of the PCRF SM instance
default:
@@ -87,6 +147,14 @@ topology_template:
label: OAM volume name 1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_vol_name_1
type: string
description: Assigning name to volume
default: sde1-pcrfx01-oam001-vol-1
@@ -94,6 +162,14 @@ topology_template:
label: Sy network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sy_net_name
type: string
description: Sy network name
default: Mobisupport-25193-I-INT1_cor_pcrf_sy_net_0
@@ -101,6 +177,14 @@ topology_template:
label: Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_vol_size
type: float
description: the size of the Cinder volume
default: 50
@@ -108,6 +192,18 @@ topology_template:
label: PCRF VNF Id
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_vnf_id
type: string
description: PCRF VNF Id
default: 730797234b4a40aa99335157b02871cd
@@ -115,6 +211,14 @@ topology_template:
label: PCRF CM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_image_name
type: string
description: PCRF CM image name
default: PCRF_8.995-ATTM1.0.3.qcow2
@@ -122,6 +226,16 @@ topology_template:
label: OAM network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_net_name
type: string
description: OAM network name
default: MNS-25180-L-01_oam_protected_net_0
@@ -129,6 +243,14 @@ topology_template:
label: Sd network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sd_net_ips
type: list
description: Sd network ips
default:
@@ -142,6 +264,14 @@ topology_template:
label: Sp network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sp_net_ips
type: list
description: Sp network ips
default:
@@ -155,6 +285,18 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_cps_net_mask
type: string
description: CPS network mask
default: 255.255.255.0
@@ -162,6 +304,14 @@ topology_template:
label: vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_volume_silver
type: string
description: the name of the target volume backend for PCM
default: Silver
@@ -169,6 +319,14 @@ topology_template:
label: Rx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_rx_net_ips
type: list
description: Rx network ips
default:
@@ -182,6 +340,14 @@ topology_template:
label: Sgi Sy network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sgi_sy_net_name
type: string
description: Sgi Sy network name
default: Mobisupport-25193-I-INT1_sgi_pcrf_sy_net_0
@@ -189,6 +355,14 @@ topology_template:
label: Sd network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sd_net_name
type: string
description: Sd network name
default: Mobisupport-25193-I-INT1_cor_pcrf_sd_net_0
@@ -196,6 +370,14 @@ topology_template:
label: CPS Cluman Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_volume_id_1
type: string
description: CPS Cluman Cinder Volume
default: 3438a3fe-1241-4390-80f2-d0b86238c40e
@@ -203,6 +385,14 @@ topology_template:
label: vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_volume_silver-2
type: string
description: the name of the target volume backend for OAM2
default: Silver
@@ -210,6 +400,14 @@ topology_template:
label: vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_volume_silver-1
type: string
description: the name of the target volume backend for OAM1
default: Silver
@@ -217,6 +415,14 @@ topology_template:
label: PCRF OAM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_flavor_name
type: string
description: flavor name of PCRF OAM instance
default: lc.4xlarge4
@@ -224,6 +430,14 @@ topology_template:
label: PCRF CM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_server_names
type: list
description: name of the PCRF CM instance
default:
@@ -234,6 +448,18 @@ topology_template:
label: CPS network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_cps_net_name
type: string
description: CPS network name
default: Mobisupport-25193-I-INT1_int_pcrf_net_0
@@ -241,6 +467,16 @@ topology_template:
label: CPS network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_net_mask
type: string
description: CPS network mask
default: 255.255.248.0
@@ -248,6 +484,14 @@ topology_template:
label: Sgi Sy network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sgi_sy_net_mask
type: string
description: Sgi Sy network mask
default: 255.255.255.248
@@ -255,6 +499,14 @@ topology_template:
label: PCRF PS image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pps_v1.0
+ source_type: HEAT
+ param_name: pcrf_pps_image_name
type: string
description: PCRF PS image name
default: PCRF_8.995-ATTM1.0.3.qcow2
@@ -262,6 +514,14 @@ topology_template:
label: CPS Internal LB VIP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_lb_internal_vip
type: string
description: CPS Internal LB VIP
default: 172.26.16.114
@@ -269,6 +529,14 @@ topology_template:
label: PCRF CM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_flavor_name
type: string
description: flavor name of PCRF CM instance
default: lc.2xlarge4
@@ -276,6 +544,14 @@ topology_template:
label: PCRF PD image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_ppd_image_name
type: string
description: PCRF PD image name
default: PCRF_8.995-ATTM1.0.3.qcow2
@@ -283,6 +559,14 @@ topology_template:
label: PCM volume name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm-volumes_v1.0
+ source_type: HEAT
+ param_name: pcrf_pcm_vol_name_1
type: string
description: Assigning name to volume
default: sde1-pcrfx01-pcm001-vol-1
@@ -290,6 +574,14 @@ topology_template:
label: Sp network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sp_net_mask
type: string
description: Sp network mask
default: 255.255.255.248
@@ -297,6 +589,14 @@ topology_template:
label: PCRF SM flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-psm_v1.0
+ source_type: HEAT
+ param_name: pcrf_psm_flavor_name
type: string
description: flavor name of PCRF SM instance
default: lc.4xlarge4
@@ -304,6 +604,14 @@ topology_template:
label: PCRF SM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-psm_v1.0
+ source_type: HEAT
+ param_name: pcrf_psm_image_name
type: string
description: PCRF SM image name
default: PCRF_8.995-ATTM1.0.3.qcow2
@@ -311,6 +619,16 @@ topology_template:
label: OAM network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_net_ips
type: list
description: OAM network ips
default:
@@ -321,6 +639,14 @@ topology_template:
label: Gx network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_gx_net_mask
type: string
description: Gx network mask
default: 255.255.255.248
@@ -328,6 +654,16 @@ topology_template:
label: CPS network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_net_gw
type: string
description: CPS network gateway
default: 107.239.64.1
@@ -335,6 +671,14 @@ topology_template:
label: Gx network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_gx_net_ips
type: list
description: Gx network ips
default:
@@ -348,6 +692,14 @@ topology_template:
label: Rx network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_rx_net_name
type: string
description: Rx network name
default: Mobisupport-25193-I-INT1_cor_pcrf_rx_net_0
@@ -355,6 +707,14 @@ topology_template:
label: PCRF OAM image name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_image_name
type: string
description: PCRF OAM image name
default: PCRF_8.995-ATTM1.0.3.qcow2
@@ -362,6 +722,18 @@ topology_template:
label: CPS network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_cps_net_ips
type: list
description: CPS network ips
default:
@@ -372,6 +744,14 @@ topology_template:
label: CPS OAM 001 Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_volume_id_1
type: string
description: CPS OAM 001 Cinder Volumes
default: a4aa05fb-fcdc-457b-8077-6845fdfc3257
@@ -379,6 +759,14 @@ topology_template:
label: CPS OAM 002 Cinder Volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_volume_id_2
type: string
description: CPS OAM 002 Cinder Volumes
default: 93d8fc1f-f1c3-4933-86b2-039881ee910f
@@ -386,6 +774,14 @@ topology_template:
label: PCRF PS server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pps_v1.0
+ source_type: HEAT
+ param_name: pcrf_pps_server_names
type: list
description: PCRF PS server names
default:
@@ -401,6 +797,14 @@ topology_template:
label: PCRF PD flavor name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_ppd_flavor_name
type: string
description: flavor name of PCRF PD instance
default: lc.4xlarge4
@@ -408,6 +812,14 @@ topology_template:
label: Sy network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sy_net_mask
type: string
description: Sy network mask
default: 255.255.255.248
@@ -415,6 +827,14 @@ topology_template:
label: OAM Arbiter LB VIP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_arbiter_vip
type: string
description: OAM Arbiter LB VIP
default: 172.26.16.115
@@ -422,6 +842,14 @@ topology_template:
label: CPS OAM LB VIP
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_lb_management_vip
type: string
description: CPS OAM LB VIP
default: 107.239.64.123
@@ -429,6 +857,14 @@ topology_template:
label: Sy network ips
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sy_net_ips
type: list
description: Sy network ips
default:
@@ -442,6 +878,14 @@ topology_template:
label: Sd network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sd_net_mask
type: string
description: Sd network mask
default: 255.255.255.248
@@ -449,6 +893,14 @@ topology_template:
label: Gx network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_gx_net_name
type: string
description: Gx network name
default: Mobisupport-25193-I-INT1_cor_pcrf_gx_net_0
@@ -456,6 +908,14 @@ topology_template:
label: Sp network name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_sp_net_name
type: string
description: Sp network name
default: Mobisupport-25193-I-INT1_cor_pcrf_sp_net_0
@@ -463,6 +923,14 @@ topology_template:
label: PCRF OAM server names
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_oam_server_names
type: list
description: name of the PCRF OAM instance
default:
@@ -474,6 +942,18 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-pcm_v1.0
+ - hot-nimbus-ppd_v1.0
+ - hot-nimbus-psm_v1.0
+ - hot-nimbus-pps_v1.0
+ - hot-nimbus-oam_v1.0
+ source_type: HEAT
+ param_name: pcrf_security_group_name
type: string
description: the name of security group
default: nimbus_security_group
@@ -481,6 +961,14 @@ topology_template:
label: Rx network mask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot-nimbus-ppd_v1.0
+ source_type: HEAT
+ param_name: pcrf_rx_net_mask
type: string
description: Rx network mask
default: 255.255.255.248
@@ -1615,4 +2103,4 @@ topology_template:
value: pcrf_oam_volume_id_22
pcrf_pcm_volume_id_1:
description: the pcrf_pcm_volume_id
- value: pcrf_pcm_volume_id_1 \ No newline at end of file
+ value: pcrf_pcm_volume_id_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml
index 48d0f4f4ef..01b68db587 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -116,4 +116,4 @@ topology_template:
- jsa_net1
- cmaui1_port_0
- cmaui1_port_1
- - cmaui1_port_2 \ No newline at end of file
+ - cmaui1_port_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml
index db70853c4b..05e87e198b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,26 +12,66 @@ topology_template:
MASTER_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: MASTER_image_name
type: string
description: JSA MASTER instance image name
MASTER_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: MASTER_names
type: string
description: JSA MASTER instance name
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: security group name of JSA
MASTER_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: MASTER_flavor_name
type: string
description: the flavor name of JSA MASTER instance
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: network name of OAM network
node_templates:
@@ -152,4 +192,4 @@ topology_template:
members:
- jsa_security_group
- MASTER_mgmt_port
- - MASTER_instance \ No newline at end of file
+ - MASTER_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml
index a8514c2921..d9f5e93cc5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,47 +12,119 @@ topology_template:
hostid_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe1
type: string
description: FE1 Hostid (from Ulticom license)
ip_address_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp2
type: string
description: STP2 IP address
Mobility_OAM_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Mobility_OAM_protected_net_id
type: string
description: Network name for OAM
hostid_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe2
type: string
description: FE2 Hostid (from Ulticom license)
flavor_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_fe_name
type: string
description: SCP FE Flavor
default: a1.Small
ip_address_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp1
type: string
description: STP1 IP address
int_vscp_ce_network_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_net_id
type: string
description: Inter-CE Network
int_vscp_ce_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_cidr
type: string
description: Private Network Address (CIDR notation)
cluster_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cluster_type
type: string
constraints:
- valid_values:
@@ -62,34 +134,82 @@ topology_template:
label: be_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_1
type: string
description: be_1 OAM ip address
be_Mobility_OAM_protected_ip_2:
label: be_2 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_2
type: string
description: be_2 OAM ip address
be_Mobility_OAM_protected_ip_0:
label: be_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_0
type: string
description: be_0 OAM ip address
ip_address_dra:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_dra
type: string
description: DRA VIP address
image_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_smp_name
type: string
description: SCP SMP image
default: asc_base_image_smp
fe_connectivity:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_connectivity
type: string
constraints:
- valid_values:
@@ -98,133 +218,325 @@ topology_template:
lab_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lab_name
type: string
description: Lab name
smp_Mobility_OAM_protected_ip_1:
label: smp_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_1
type: string
description: smp_1 OAM ip address
fe_SIGNET_vrf_B1_direct_ip_0:
label: fe1 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_B1_direct_ip_0
type: string
description: fe1 SIGTRAN ip address
smp_Mobility_OAM_protected_ip_0:
label: smp_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_0
type: string
description: smp_0 OAM ip address
int_vscp_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_net_id
type: string
description: LAN3 Cluster
be_Mobility_OAM_protected_ip_3:
label: be_3 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_3
type: string
description: be_3 OAM ip address
be_Mobility_OAM_protected_ip_4:
label: be_4 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_4
type: string
description: be_4 OAM ip address
hostname_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_nee1
type: string
description: NEE1 Hostname (from Ulticom license)
int_vscp_fe_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_net_id
type: string
description: LAN2 FE Cluster/KA
SIGNET_vrf_A1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_A1_direct_net_id
type: string
description: Network name for SIGTRAN_A
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: key_name
type: string
description: keypair to enable SSH access to the instance.
default: vSCP-keypair
int_vscp_fe_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_cidr
type: string
description: Private Network2 Address (CIDR notation)
fe_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_1
type: string
description: name of VM
default: vSCP_FE2
fe_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_0
type: string
description: name of VM
default: vSCP_FE1
policy_value:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: policy_value
type: string
be_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_0
type: string
description: name of VM
default: vSCP_BE1
int_vscp_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_cidr
type: string
description: Private Network3 Address (CIDR notation)
be_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_1
type: string
description: name of VM
default: vSCP_BE2
be_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_2
type: string
description: name of VM
default: vSCP_BE3
point_code_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp
type: string
description: STP virtual point code (in "zone-cluster-member" format)
be_name_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_3
type: string
description: name of VM
default: vSCP_BE4
be_name_4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_4
type: string
description: name of VM
default: vSCP_BE5
global_title_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_scp
type: string
description: vSCP Global Title address
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VNF instance
default: This_is_the_SCP_name
@@ -232,156 +544,380 @@ topology_template:
label: be3 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_2
type: string
description: be3 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_0:
label: fe_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_0
type: string
description: fe_0 OAM ip address
hostname_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe1
type: string
description: FE1 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_1:
label: be2 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_1
type: string
description: be2 Cricket_OCS ip address
hostname_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe2
type: string
description: FE2 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_4:
label: be5 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_4
type: string
description: be5 Cricket_OCS ip address
be_Cricket_OCS_protected_ip_3:
label: be4 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_3
type: string
description: be4 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_1:
label: fe_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_1
type: string
description: fe_1 OAM ip address
be_Cricket_OCS_protected_ip_0:
label: be1 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_0
type: string
description: be1 Cricket_OCS ip address
route_table_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe1
type: string
description: Additional route table for FE1
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Network name for CRICKET_OCS
smp_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_2
type: string
description: name of VM
default: vSMP2
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_SCP_id
smp_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_1
type: string
description: name of VM
default: vSMP2
flavor_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_smp_name
type: string
description: SCP SMP Flavor
default: a1.Small
image_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_be_name
type: string
description: SCP BE image
default: asc_base_image_be
smp_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_0
type: string
description: name of VM
default: vSMP1
route_table_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe2
type: string
description: Additional route table for FE2
hostid_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_nee1
type: string
description: NEE1 Hostid (from Ulticom license)
SIGNET_vrf_B1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_B1_direct_net_id
type: string
description: Network name for SIGTRAN_B
fe_SIGNET_vrf_A1_direct_ip_0:
label: fe2 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_A1_direct_ip_0
type: string
description: fe2 SIGTRAN ip address
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
nee_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nee_name_0
type: string
description: name of VM
default: vNEE
ip_port_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp1
type: string
description: STP1 IP port
ip_port_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp2
type: string
description: STP2 IP port
image_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_fe_name
type: string
description: SCP FE image
default: asc_base_image_fe
flavor_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_be_name
type: string
description: SCP BE Flavor
default: a1.Small
policyListParam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: policyListParam
type: list
description: Policy server group. affinity/anti-affinity
constraints:
@@ -394,47 +930,119 @@ topology_template:
label: vSCP security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: vSCP security group name
ip_port_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe2
type: string
description: FE2 IP port in SIGTRAN network
route_table_be:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_be
type: string
description: Additional route table for BEs
ip_port_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe1
type: string
description: FE1 IP port in SIGTRAN network
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: port_name
type: string
description: port name
default: port_name
point_code_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_scp
type: string
description: vSCP point code (in "zone-cluster-member" format)
global_title_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_stp
type: string
description: STP Global Title address
point_code_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp1
type: string
description: STP1 point code (in "zone-cluster-member" format)
point_code_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp2
type: string
description: STP2 point code (in "zone-cluster-member" format)
node_templates:
@@ -618,4 +1226,4 @@ topology_template:
name: abc
affinity: host
targets:
- - FE_SMP_Affinity_group \ No newline at end of file
+ - FE_SMP_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml
index b6c5471953..5fa3ea7bbf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/sharedServerGroup/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,51 +12,131 @@ topology_template:
hostid_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe1
type: string
description: FE1 Hostid (from Ulticom license)
ip_address_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp2
type: string
description: STP2 IP address
Mobility_OAM_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Mobility_OAM_protected_net_id
type: string
description: Network name for OAM
hostid_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe2
type: string
description: FE2 Hostid (from Ulticom license)
flavor_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_fe_name
type: string
description: SCP FE Flavor
default: a1.Small
ip_address_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp1
type: string
description: STP1 IP address
int_vscp_ce_network_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_net_id
type: string
description: Inter-CE Network
shared_server_group:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_server_group
type: string
int_vscp_ce_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_cidr
type: string
description: Private Network Address (CIDR notation)
cluster_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cluster_type
type: string
constraints:
- valid_values:
@@ -66,32 +146,81 @@ topology_template:
label: be_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_1
type: string
description: be_1 OAM ip address
be_Mobility_OAM_protected_ip_2:
label: be_2 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_2
type: string
description: be_2 OAM ip address
be_Mobility_OAM_protected_ip_0:
label: be_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_0
type: string
description: be_0 OAM ip address
ip_address_dra:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_dra
type: string
description: DRA VIP address
image_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot_template
+ source_type: HEAT
+ param_name: image_smp_name
type: string
fe_connectivity:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_connectivity
type: string
constraints:
- valid_values:
@@ -100,129 +229,313 @@ topology_template:
lab_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lab_name
type: string
description: Lab name
smp_Mobility_OAM_protected_ip_1:
label: smp_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_1
type: string
description: smp_1 OAM ip address
fe_SIGNET_vrf_B1_direct_ip_0:
label: fe1 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_B1_direct_ip_0
type: string
description: fe1 SIGTRAN ip address
smp_Mobility_OAM_protected_ip_0:
label: smp_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_0
type: string
description: smp_0 OAM ip address
int_vscp_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_net_id
type: string
description: LAN3 Cluster
be_Mobility_OAM_protected_ip_3:
label: be_3 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_3
type: string
description: be_3 OAM ip address
be_Mobility_OAM_protected_ip_4:
label: be_4 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_4
type: string
description: be_4 OAM ip address
hostname_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_nee1
type: string
description: NEE1 Hostname (from Ulticom license)
int_vscp_fe_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_net_id
type: string
description: LAN2 FE Cluster/KA
SIGNET_vrf_A1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_A1_direct_net_id
type: string
description: Network name for SIGTRAN_A
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: key_name
type: string
description: keypair to enable SSH access to the instance.
default: vSCP-keypair
int_vscp_fe_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_cidr
type: string
description: Private Network2 Address (CIDR notation)
fe_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_1
type: string
description: name of VM
default: vSCP_FE2
fe_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_0
type: string
description: name of VM
default: vSCP_FE1
be_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_0
type: string
description: name of VM
default: vSCP_BE1
int_vscp_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_cidr
type: string
description: Private Network3 Address (CIDR notation)
be_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_1
type: string
description: name of VM
default: vSCP_BE2
be_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_2
type: string
description: name of VM
default: vSCP_BE3
point_code_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp
type: string
description: STP virtual point code (in "zone-cluster-member" format)
be_name_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_3
type: string
description: name of VM
default: vSCP_BE4
be_name_4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_4
type: string
description: name of VM
default: vSCP_BE5
global_title_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_scp
type: string
description: vSCP Global Title address
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VNF instance
default: This_is_the_SCP_name
@@ -230,198 +543,497 @@ topology_template:
label: be3 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_2
type: string
description: be3 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_0:
label: fe_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_0
type: string
description: fe_0 OAM ip address
hostname_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe1
type: string
description: FE1 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_1:
label: be2 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_1
type: string
description: be2 Cricket_OCS ip address
hostname_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe2
type: string
description: FE2 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_4:
label: be5 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_4
type: string
description: be5 Cricket_OCS ip address
be_Cricket_OCS_protected_ip_3:
label: be4 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_3
type: string
description: be4 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_1:
label: fe_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_1
type: string
description: fe_1 OAM ip address
be_Cricket_OCS_protected_ip_0:
label: be1 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_0
type: string
description: be1 Cricket_OCS ip address
route_table_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe1
type: string
description: Additional route table for FE1
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Network name for CRICKET_OCS
smp_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_2
type: string
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_SCP_id
smp_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_1
type: string
description: name of VM
default: vSMP2
flavor_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_smp_name
type: string
image_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_be_name
type: string
description: SCP BE image
default: asc_base_image_be
smp_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_0
type: string
description: name of VM
default: vSMP1
route_table_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe2
type: string
description: Additional route table for FE2
hostid_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_nee1
type: string
description: NEE1 Hostid (from Ulticom license)
SIGNET_vrf_B1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_B1_direct_net_id
type: string
description: Network name for SIGTRAN_B
fe_SIGNET_vrf_A1_direct_ip_0:
label: fe2 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_A1_direct_ip_0
type: string
description: fe2 SIGTRAN ip address
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
nee_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nee_name_0
type: string
description: name of VM
default: vNEE
ip_port_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp1
type: string
description: STP1 IP port
ip_port_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp2
type: string
description: STP2 IP port
image_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_fe_name
type: string
description: SCP FE image
default: asc_base_image_fe
flavor_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_be_name
type: string
description: SCP BE Flavor
default: a1.Small
shared_nova:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_nova
type: string
security_group_name:
label: vSCP security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: vSCP security group name
ip_port_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe2
type: string
description: FE2 IP port in SIGTRAN network
route_table_be:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_be
type: string
description: Additional route table for BEs
ip_port_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe1
type: string
description: FE1 IP port in SIGTRAN network
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: port_name
type: string
description: port name
default: port_name
point_code_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_scp
type: string
description: vSCP point code (in "zone-cluster-member" format)
global_title_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_stp
type: string
description: STP Global Title address
point_code_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp1
type: string
description: STP1 point code (in "zone-cluster-member" format)
point_code_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp2
type: string
description: STP2 point code (in "zone-cluster-member" format)
node_templates:
@@ -506,4 +1118,4 @@ topology_template:
name: def
container_type: host
targets:
- - Multi_Anti_Affinity_group \ No newline at end of file
+ - Multi_Anti_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml
index 299ad49955..8d28831726 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,47 +12,119 @@ topology_template:
hostid_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe1
type: string
description: FE1 Hostid (from Ulticom license)
ip_address_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp2
type: string
description: STP2 IP address
Mobility_OAM_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Mobility_OAM_protected_net_id
type: string
description: Network name for OAM
hostid_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_fe2
type: string
description: FE2 Hostid (from Ulticom license)
flavor_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_fe_name
type: string
description: SCP FE Flavor
default: a1.Small
ip_address_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_stp1
type: string
description: STP1 IP address
int_vscp_ce_network_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_net_id
type: string
description: Inter-CE Network
int_vscp_ce_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_ce_network_cidr
type: string
description: Private Network Address (CIDR notation)
cluster_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cluster_type
type: string
constraints:
- valid_values:
@@ -62,34 +134,82 @@ topology_template:
label: be_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_1
type: string
description: be_1 OAM ip address
be_Mobility_OAM_protected_ip_2:
label: be_2 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_2
type: string
description: be_2 OAM ip address
be_Mobility_OAM_protected_ip_0:
label: be_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_0
type: string
description: be_0 OAM ip address
ip_address_dra:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_address_dra
type: string
description: DRA VIP address
image_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_smp_name
type: string
description: SCP SMP image
default: asc_base_image_smp
fe_connectivity:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_connectivity
type: string
constraints:
- valid_values:
@@ -98,129 +218,313 @@ topology_template:
lab_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: lab_name
type: string
description: Lab name
smp_Mobility_OAM_protected_ip_1:
label: smp_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_1
type: string
description: smp_1 OAM ip address
fe_SIGNET_vrf_B1_direct_ip_0:
label: fe1 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_B1_direct_ip_0
type: string
description: fe1 SIGTRAN ip address
smp_Mobility_OAM_protected_ip_0:
label: smp_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_0
type: string
description: smp_0 OAM ip address
int_vscp_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_net_id
type: string
description: LAN3 Cluster
be_Mobility_OAM_protected_ip_3:
label: be_3 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_3
type: string
description: be_3 OAM ip address
be_Mobility_OAM_protected_ip_4:
label: be_4 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_4
type: string
description: be_4 OAM ip address
hostname_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_nee1
type: string
description: NEE1 Hostname (from Ulticom license)
int_vscp_fe_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_net_id
type: string
description: LAN2 FE Cluster/KA
SIGNET_vrf_A1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_A1_direct_net_id
type: string
description: Network name for SIGTRAN_A
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: key_name
type: string
description: keypair to enable SSH access to the instance.
default: vSCP-keypair
int_vscp_fe_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_cidr
type: string
description: Private Network2 Address (CIDR notation)
fe_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_1
type: string
description: name of VM
default: vSCP_FE2
fe_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_name_0
type: string
description: name of VM
default: vSCP_FE1
be_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_0
type: string
description: name of VM
default: vSCP_BE1
int_vscp_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: int_vscp_cluster_cidr
type: string
description: Private Network3 Address (CIDR notation)
be_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_1
type: string
description: name of VM
default: vSCP_BE2
be_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_2
type: string
description: name of VM
default: vSCP_BE3
point_code_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp
type: string
description: STP virtual point code (in "zone-cluster-member" format)
be_name_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_3
type: string
description: name of VM
default: vSCP_BE4
be_name_4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_name_4
type: string
description: name of VM
default: vSCP_BE5
global_title_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_scp
type: string
description: vSCP Global Title address
vnf_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_name
type: string
description: Unique name for this VNF instance
default: This_is_the_SCP_name
@@ -228,150 +532,366 @@ topology_template:
label: be3 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_2
type: string
description: be3 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_0:
label: fe_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_0
type: string
description: fe_0 OAM ip address
hostname_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe1
type: string
description: FE1 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_1:
label: be2 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_1
type: string
description: be2 Cricket_OCS ip address
hostname_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostname_fe2
type: string
description: FE2 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_4:
label: be5 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_4
type: string
description: be5 Cricket_OCS ip address
be_Cricket_OCS_protected_ip_3:
label: be4 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_3
type: string
description: be4 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_1:
label: fe_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_1
type: string
description: fe_1 OAM ip address
be_Cricket_OCS_protected_ip_0:
label: be1 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_0
type: string
description: be1 Cricket_OCS ip address
route_table_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe1
type: string
description: Additional route table for FE1
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Network name for CRICKET_OCS
smp_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_2
type: string
description: name of VM
default: vSMP2
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_SCP_id
smp_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_1
type: string
description: name of VM
default: vSMP2
flavor_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_smp_name
type: string
description: SCP SMP Flavor
default: a1.Small
image_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_be_name
type: string
description: SCP BE image
default: asc_base_image_be
smp_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: smp_name_0
type: string
description: name of VM
default: vSMP1
route_table_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_fe2
type: string
description: Additional route table for FE2
hostid_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: hostid_nee1
type: string
description: NEE1 Hostid (from Ulticom license)
SIGNET_vrf_B1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: SIGNET_vrf_B1_direct_net_id
type: string
description: Network name for SIGTRAN_B
fe_SIGNET_vrf_A1_direct_ip_0:
label: fe2 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_A1_direct_ip_0
type: string
description: fe2 SIGTRAN ip address
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
nee_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: nee_name_0
type: string
description: name of VM
default: vNEE
ip_port_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp1
type: string
description: STP1 IP port
ip_port_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_stp2
type: string
description: STP2 IP port
image_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: image_scp_fe_name
type: string
description: SCP FE image
default: asc_base_image_fe
flavor_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: flavor_scp_be_name
type: string
description: SCP BE Flavor
default: a1.Small
@@ -379,47 +899,119 @@ topology_template:
label: vSCP security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: vSCP security group name
ip_port_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe2
type: string
description: FE2 IP port in SIGTRAN network
route_table_be:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: route_table_be
type: string
description: Additional route table for BEs
ip_port_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: ip_port_fe1
type: string
description: FE1 IP port in SIGTRAN network
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: port_name
type: string
description: port name
default: port_name
point_code_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_scp
type: string
description: vSCP point code (in "zone-cluster-member" format)
global_title_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: global_title_stp
type: string
description: STP Global Title address
point_code_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp1
type: string
description: STP1 point code (in "zone-cluster-member" format)
point_code_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: point_code_stp2
type: string
description: STP2 point code (in "zone-cluster-member" format)
node_templates:
@@ -612,4 +1204,4 @@ topology_template:
name: def
container_type: host
targets:
- - Multi_Anti_Affinity_group \ No newline at end of file
+ - Multi_Anti_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
index 471de08e0c..773101be16 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,28 +11,84 @@ topology_template:
p2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: p2
type: string
description: shared_vol2
cmaui_cinder_volume_size:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vol_b
+ - vol_a
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: string
exposed_vol1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: exposed_vol1
type: string
contrail_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vol_b
+ - vol_a
+ - main
+ source_type: HEAT
+ param_name: contrail_net_name
type: string
description: network name of jsa log network
CMAUI_volume_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vol_b
+ - vol_a
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
jsa_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vol_b
+ - vol_a
+ - main
+ source_type: HEAT
+ param_name: jsa_name
type: string
description: network name of jsa log network
node_templates:
@@ -163,4 +219,4 @@ topology_template:
p2:
value: test_vol2
exposed_vol1:
- value: test_vol1 \ No newline at end of file
+ value: test_vol1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index d3c471ef0e..0f6b7e72c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -19,69 +27,166 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: 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: the name of security group
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
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 VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
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
inner_cmaui_volume_a2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: inner_cmaui_volume_a2
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
inner_cmaui_volume_b3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: inner_cmaui_volume_b3
type: list
entry_schema:
type: string
inner_cmaui_volume_a1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: inner_cmaui_volume_a1
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
@@ -89,6 +194,14 @@ topology_template:
label: CMAUI oam_net IP addresses
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: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -97,23 +210,56 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
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: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -179,4 +325,4 @@ topology_template:
inner_cmaui_volume_b3:
value: inner_cmaui_volume_a1
inner_cmaui_volume_a1:
- value: inner_cmaui_volume_a1 \ No newline at end of file
+ value: inner_cmaui_volume_a1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index 2c7d854590..fe9c34a568 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,15 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -20,80 +29,203 @@ topology_template:
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_10
type: string
description: availabilityzone name
cmaui_cinder_volume_size:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
cmaui_volume:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_volume
type: string
description: the name of the target volume backend
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
cmaui_volume_param1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: cmaui_volume_param1
type: string
description: nova server id
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
cmaui_volume_param2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: cmaui_volume_param2
type: string
description: nova server id
availability_zone_0:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -102,28 +234,72 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
server_cmaui21:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: server_cmaui21
type: string
description: nova server id
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
node_templates:
@@ -317,4 +493,4 @@ topology_template:
- cmaui_port_2
- server_cmaui2
- server_cmaui1
- - cmaui_port_1 \ No newline at end of file
+ - cmaui_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index b48a12fabb..a6843e335d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,19 +14,51 @@ topology_template:
cmaui_cinder_volume_size:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
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 jsa log network
CMAUI_volume_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
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:
@@ -151,4 +183,4 @@ topology_template:
- test_vol1
- test_resourceGroup
- test_vol2
- - test_nova \ No newline at end of file
+ - test_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index eb88006897..ceb1117e4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,12 +12,28 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -49,4 +65,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- test_vol
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index 68a215fb8a..3ae12abd30 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,6 +14,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -21,27 +29,67 @@ topology_template:
p1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: p1
type: string
description: UID of OAM network
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
cmaui_cinder_volume_size:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
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: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -50,16 +98,40 @@ topology_template:
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
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -128,4 +200,4 @@ topology_template:
- server_cmaui1
- test_vol
- cmaui_port_1
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index a55e57dc3d..a82686f24b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
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:
@@ -20,74 +28,179 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: 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: string
description: the name of security group
cmaui_volume:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: cmaui_volume
type: string
description: the name of the target volume backend
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_volume_param1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: cmaui_volume_param1
type: string
description: nova server id
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
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
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
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
cmaui_volume_param2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: cmaui_volume_param2
type: string
description: nova server id
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
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
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: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -96,23 +209,56 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
node_templates:
@@ -269,4 +415,4 @@ topology_template:
- cmaui_port_2
- server_cmaui2
- server_cmaui1
- - cmaui_port_1 \ No newline at end of file
+ - cmaui_port_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index f618ad4beb..1bd7482d06 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,32 +14,92 @@ topology_template:
p2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: p2
type: string
description: shared_vol2
cmaui_cinder_volume_size:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: string
shared_nova:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_nova
type: string
shared_vol1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_vol1
type: string
contrail_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: contrail_net_name
type: string
description: network name of jsa log network
CMAUI_volume_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
jsa_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: jsa_name
type: string
description: network name of jsa log network
node_templates:
@@ -175,4 +235,4 @@ topology_template:
members:
- test_nested1Level
- test_nestedInvalidConnectionToNova
- - test_resourceGroup \ No newline at end of file
+ - test_resourceGroup
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index c8cf1df9cd..b0b26f59fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,22 +12,56 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
shared_vol1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_vol1
type: string
description: volume name
shared_vol2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_vol2
type: string
description: volume name
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -87,4 +121,4 @@ topology_template:
- test_nested
outputs:
out1_not_shared:
- value: test_nested \ No newline at end of file
+ value: test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
index e73284b3b5..eaed82b0ea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,6 +14,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -21,27 +29,68 @@ topology_template:
p1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: p1
type: string
description: UID of OAM network
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
cmaui_cinder_volume_size:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
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: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -50,26 +99,67 @@ topology_template:
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
shared_vol1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_vol1
type: string
description: volume 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
shared_vol2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_vol2
type: string
description: volume name
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -163,4 +253,4 @@ topology_template:
- test_nested
outputs:
out1_not_shared:
- value: test_nested \ No newline at end of file
+ value: test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
index 79d7b564f8..7ef24e0b47 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,99 +11,267 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
type: string
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -198,4 +366,4 @@ topology_template:
members:
- template_NetworkPolicy
- test_net
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index aa6da4f4d8..ef60b3d606 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,114 +11,306 @@ topology_template:
left_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn_fqdn
type: string
description: dummy
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
src_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_start
type: string
description: dummy
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: string
src_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: src_port_end
type: string
description: dummy
policy_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: policy_name
type: string
description: dummy
dst_port_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_end
type: string
description: dummy
simple_action:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: simple_action
type: string
description: dummy
service_instance_fq_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: service_instance_fq_name
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 log network
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
protocol:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: protocol
type: string
description: dummy
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
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: string
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
dst_port_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: dst_port_start
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_addr_from_start_true:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_addr_from_start_true
type: string
description: dummy
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
right_vn_fqdn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: right_vn_fqdn
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_2
type: string
description: dummy
left_vn:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: left_vn
type: string
description: dummy
direction:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: direction
type: string
description: dummy
network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_2
type: string
description: dummy
node_templates:
@@ -307,4 +499,4 @@ topology_template:
members:
- test_nested2
- test_nested3
- - test_nested1 \ 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/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index 8b3212a3d2..85ae4ce91f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
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:
@@ -19,21 +27,53 @@ 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
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
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
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:
@@ -42,20 +82,52 @@ topology_template:
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
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
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
node_templates:
@@ -125,4 +197,4 @@ topology_template:
description: cmaui server template for vMMSC
members:
- server_cmaui
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
index 43427622c2..17243baafa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ 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:
@@ -42,4 +50,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- test_net
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 5668311fae..f73fc32338 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,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:
@@ -140,4 +164,4 @@ topology_template:
- test_contrailV2_net
- test_net
- test_contrail_net
- - test_nova \ No newline at end of file
+ - test_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
index 48355465d1..2546b6f4da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,16 +11,40 @@ 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:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
node_templates:
@@ -117,4 +141,4 @@ topology_template:
members:
- test_nested2
- test_nested3
- - test_nested1 \ 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/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index 8b3212a3d2..85ae4ce91f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
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:
@@ -19,21 +27,53 @@ 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
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
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
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:
@@ -42,20 +82,52 @@ topology_template:
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
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
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
node_templates:
@@ -125,4 +197,4 @@ topology_template:
description: cmaui server template for vMMSC
members:
- server_cmaui
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 3989a1db54..6a668d65b3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,32 +14,89 @@ topology_template:
shared_test_nova:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_nova
type: string
shared_test_contrail_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_contrail_net
type: string
contrail_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: contrail_net_name
type: string
description: network name of jsa log network
shared_test_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_net
type: string
shared_test_contrailV2_net:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_contrailV2_net
type: string
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
jsa_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: jsa_name
type: string
node_templates:
test_nestedInvalidConnectionToNetwork:
@@ -171,4 +228,4 @@ topology_template:
- test_nestedInvalidConnectionToNetwork
- test_nested1Level
- test_nestedPassArrayParam
- - test_resourceGroup \ No newline at end of file
+ - test_resourceGroup
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/MainServiceTemplate.yaml
index 23d80fdc81..56c5a19bf2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ 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:
@@ -58,4 +66,4 @@ topology_template:
members:
- mvs_modules
- test_net
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
index 82dba4052f..ec329b11f2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
@@ -11,16 +11,40 @@ 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:
+ - main
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
node_templates:
@@ -104,4 +128,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- mvs_modules
- - test_nested1 \ 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/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index ea87be355a..cdaddc019d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,47 +12,119 @@ topology_template:
hostid_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostid_fe1
type: string
description: FE1 Hostid (from Ulticom license)
ip_address_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_address_stp2
type: string
description: STP2 IP address
Mobility_OAM_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Mobility_OAM_protected_net_id
type: string
description: Network name for OAM
hostid_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostid_fe2
type: string
description: FE2 Hostid (from Ulticom license)
flavor_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: flavor_scp_fe_name
type: string
description: SCP FE Flavor
default: a1.Small
ip_address_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_address_stp1
type: string
description: STP1 IP address
int_vscp_ce_network_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_ce_network_net_id
type: string
description: Inter-CE Network
int_vscp_ce_network_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_ce_network_cidr
type: string
description: Private Network Address (CIDR notation)
cluster_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cluster_type
type: string
constraints:
- valid_values:
@@ -62,34 +134,85 @@ topology_template:
label: be_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_1
type: string
description: be_1 OAM ip address
be_Mobility_OAM_protected_ip_2:
label: be_2 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_2
type: string
description: be_2 OAM ip address
be_Mobility_OAM_protected_ip_0:
label: be_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_0
type: string
description: be_0 OAM ip address
ip_address_dra:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_address_dra
type: string
description: DRA VIP address
image_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: image_smp_name
type: string
description: SCP SMP image
default: asc_base_image_smp
fe_connectivity:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_connectivity
type: string
constraints:
- valid_values:
@@ -98,129 +221,316 @@ topology_template:
lab_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: lab_name
type: string
description: Lab name
smp_Mobility_OAM_protected_ip_1:
label: smp_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_1
type: string
description: smp_1 OAM ip address
fe_SIGNET_vrf_B1_direct_ip_0:
label: fe1 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_B1_direct_ip_0
type: string
description: fe1 SIGTRAN ip address
smp_Mobility_OAM_protected_ip_0:
label: smp_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: smp_Mobility_OAM_protected_ip_0
type: string
description: smp_0 OAM ip address
int_vscp_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_cluster_net_id
type: string
description: LAN3 Cluster
be_Mobility_OAM_protected_ip_3:
label: be_3 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_3
type: string
description: be_3 OAM ip address
be_Mobility_OAM_protected_ip_4:
label: be_4 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Mobility_OAM_protected_ip_4
type: string
description: be_4 OAM ip address
hostname_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostname_nee1
type: string
description: NEE1 Hostname (from Ulticom license)
int_vscp_fe_cluster_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_net_id
type: string
description: LAN2 FE Cluster/KA
SIGNET_vrf_A1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: SIGNET_vrf_A1_direct_net_id
type: string
description: Network name for SIGTRAN_A
key_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: key_name
type: string
description: keypair to enable SSH access to the instance.
default: vSCP-keypair
int_vscp_fe_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_fe_cluster_cidr
type: string
description: Private Network2 Address (CIDR notation)
fe_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_name_1
type: string
description: name of VM
default: vSCP_FE2
fe_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_name_0
type: string
description: name of VM
default: vSCP_FE1
be_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_name_0
type: string
description: name of VM
default: vSCP_BE1
int_vscp_cluster_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: int_vscp_cluster_cidr
type: string
description: Private Network3 Address (CIDR notation)
be_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_name_1
type: string
description: name of VM
default: vSCP_BE2
be_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_name_2
type: string
description: name of VM
default: vSCP_BE3
point_code_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: point_code_stp
type: string
description: STP virtual point code (in "zone-cluster-member" format)
be_name_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_name_3
type: string
description: name of VM
default: vSCP_BE4
be_name_4:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_name_4
type: string
description: name of VM
default: vSCP_BE5
global_title_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: global_title_scp
type: string
description: vSCP Global Title address
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 VNF instance
default: This_is_the_SCP_name
@@ -228,155 +538,392 @@ topology_template:
label: be3 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_2
type: string
description: be3 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_0:
label: fe_0 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_0
type: string
description: fe_0 OAM ip address
hostname_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostname_fe1
type: string
description: FE1 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_1:
label: be2 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_1
type: string
description: be2 Cricket_OCS ip address
hostname_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostname_fe2
type: string
description: FE2 Hostname (from Ulticom license)
be_Cricket_OCS_protected_ip_4:
label: be5 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_4
type: string
description: be5 Cricket_OCS ip address
be_Cricket_OCS_protected_ip_3:
label: be4 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_3
type: string
description: be4 Cricket_OCS ip address
fe_Mobility_OAM_protected_ip_1:
label: fe_1 OAM ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_Mobility_OAM_protected_ip_1
type: string
description: fe_1 OAM ip address
be_Cricket_OCS_protected_ip_0:
label: be1 Cricket_OCS ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: be_Cricket_OCS_protected_ip_0
type: string
description: be1 Cricket_OCS ip address
route_table_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: route_table_fe1
type: string
description: Additional route table for FE1
Cricket_OCS_protected_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: Cricket_OCS_protected_net_id
type: string
description: Network name for CRICKET_OCS
smp_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: smp_name_2
type: string
description: name of VM
default: vSMP2
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_SCP_id
smp_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn1
+ - main
+ source_type: HEAT
+ param_name: smp_name_1
type: string
description: name of VM
default: vSMP2
flavor_smp_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: flavor_smp_name
type: string
description: SCP SMP Flavor
default: a1.Small
image_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: image_scp_be_name
type: string
description: SCP BE image
default: asc_base_image_be
smp_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: smp_name_0
type: string
description: name of VM
default: vSMP1
route_table_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: route_table_fe2
type: string
description: Additional route table for FE2
hostid_nee1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: hostid_nee1
type: string
description: NEE1 Hostid (from Ulticom license)
SIGNET_vrf_B1_direct_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: SIGNET_vrf_B1_direct_net_id
type: string
description: Network name for SIGTRAN_B
fe_SIGNET_vrf_A1_direct_ip_0:
label: fe2 SIGTRAN ip address
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: fe_SIGNET_vrf_A1_direct_ip_0
type: string
description: fe2 SIGTRAN ip address
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
nee_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: nee_name_0
type: string
description: name of VM
default: vNEE
fe_smp_affinity_param:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn2
+ source_type: HEAT
+ param_name: fe_smp_affinity_param
type: string
description: be affinity param
ip_port_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_port_stp1
type: string
description: STP1 IP port
ip_port_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_port_stp2
type: string
description: STP2 IP port
image_scp_fe_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: image_scp_fe_name
type: string
description: SCP FE image
default: asc_base_image_fe
flavor_scp_be_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: flavor_scp_be_name
type: string
description: SCP BE Flavor
default: a1.Small
@@ -384,57 +931,148 @@ topology_template:
label: vSCP 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: vSCP security group name
ip_port_fe2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_port_fe2
type: string
description: FE2 IP port in SIGTRAN network
route_table_be:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: route_table_be
type: string
description: Additional route table for BEs
ip_port_fe1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: ip_port_fe1
type: string
description: FE1 IP port in SIGTRAN network
port_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ - addOn1
+ - addOn2
+ - main
+ source_type: HEAT
+ param_name: port_name
type: string
description: port name
default: port_name
be_affinity_param:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn1
+ source_type: HEAT
+ param_name: be_affinity_param
type: string
description: be affinity param
point_code_scp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: point_code_scp
type: string
description: vSCP point code (in "zone-cluster-member" format)
global_title_stp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: global_title_stp
type: string
description: STP Global Title address
point_code_stp1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: point_code_stp1
type: string
description: STP1 point code (in "zone-cluster-member" format)
point_code_stp2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: point_code_stp2
type: string
description: STP2 point code (in "zone-cluster-member" format)
multi_anti_affinity_param:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn3
+ source_type: HEAT
+ param_name: multi_anti_affinity_param
type: string
description: be affinity param
node_templates:
@@ -667,4 +1305,4 @@ topology_template:
name: def
container_type: host
targets:
- - Multi_Anti_Affinity_group \ No newline at end of file
+ - Multi_Anti_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index 6616fbb42b..ef939ddd73 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,11 +14,27 @@ topology_template:
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: network name of jsa log 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
node_templates:
@@ -269,4 +285,4 @@ topology_template:
- test_resourceGroup
- jsa_security_group1
- jsa_security_group2
- - test_nova \ No newline at end of file
+ - test_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
index de4eb2c145..02223317d6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml
@@ -11,88 +11,208 @@ topology_template:
vprobe_volume_type_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_type_0
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vprobe_volume_type_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_type_1
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vprobe_volume_type_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_type_2
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
oam_private_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: oam_private_net_name
type: string
description: A string specifying a symbolic name for the network
vProbe_cluster_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vProbe_cluster_name
type: string
description: The component cluster name
default: vProbe_cluster
qrouter_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_flavor_name
type: string
description: The ID or name of the flavor to boot onto
default: m1.large
version_number:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: version_number
type: string
description: The version number of the component
default: 11.1.5
vLB_version_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_version_name
type: string
description: The version name of the component.
default: vProbe.r.11.1.e._08_16-12_53
vprobe_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_flavor_name
type: string
description: The name of the flavor to boot onto
default: m1.large
domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: domain_name
type: string
description: The servers domain
ntp_timezone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: ntp_timezone
type: string
description: Name of NTP Time zone to be used
default: UTC
packet_mirror_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
default: 20.20.5.0/24
vLBAgent_cluster_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_cluster_name
type: string
description: The component cluster name
default: vLBAgent_cluster
vLB_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_type
type: string
description: The type of VLB. MME or SGW.
default: mme
qrouter_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_names
type: list
description: VM Names for QRouter VMs
entry_schema:
@@ -100,16 +220,40 @@ topology_template:
win_domain_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: win_domain_name
type: string
description: Windows servers' domain
tenant_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: tenant_name
type: string
description: Name of tenant to be used
vLB_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_names
type: list
description: VM Names for vLB VMs
entry_schema:
@@ -117,337 +261,801 @@ topology_template:
vprobe_volume_size_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_size_2
type: float
description: The size of the volume in GB
default: 1
vLBAgent_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_flavor_name
type: string
description: The ID or name of the flavor to boot onto
default: m1.large
vprobe_volume_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_name_0
type: string
description: The name of the volume
default: data
vprobe_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_size_0
type: float
description: The size of the volume in GB
default: 100
vprobe_volume_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_name_1
type: string
description: The name of the volume
default: log
vprobe_volume_size_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_size_1
type: float
description: The size of the volume in GB
default: 5
vprobe_volume_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_volume_name_2
type: string
description: The name of the volume
default: config
packet_mirror_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
default: 20.20.5.2
vLBAgent_version_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_version_name
type: string
description: The version name of the component
default: vProbe.r.11.1.e._08_16-12_53
vLB_volume_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_name_2
type: string
description: The name of the volume
default: config
cdr_network:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: cdr_network
type: string
description: A string specifying a symbolic name for the network
vLBAgent_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_type
type: string
description: vLBAgent Type. mme or sgw
default: mme
vProbe_node_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vProbe_node_count
type: float
description: The number of nodes to create
default: 1
packet_internal_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_end
type: string
description: End address for the allocation pool
default: 192.0.6.250
vLBAgent_volume_type_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_type_0
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_volume_type_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_type_1
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_volume_size_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_size_1
type: float
description: The size of the volume in GB
default: 1
vLBAgent_volume_type_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_type_2
type: string
description: The Cinder volume type. Used to specify the backend.
default: volumes_ceph
vLB_volume_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_name_0
type: string
description: The name of the volume
default: data
vLB_volume_type_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_type_1
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_volume_size_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_size_2
type: float
description: The size of the volume in Gigabytes.
default: 1
vLB_volume_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_name_1
type: string
description: The name of the volume
default: log
vLB_volume_type_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_type_2
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_size_0
type: float
description: The size of the volume in GB
default: 15
vLB_volume_type_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_type_0
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_volume_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_name_2
type: string
description: The name of the volume
default: config
vLBAgent_volume_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_name_1
type: string
description: The name of the volume
default: log
vLBAgent_volume_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_volume_name_0
type: string
description: The name of the volume
default: data
vLB_volume_size_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_size_1
type: float
description: The size of the volume in GB.
default: 1
vLB_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_size_0
type: float
description: The size of the volume in GB.
default: 10
packet_mirror_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_name
type: string
description: The name of the subnet
default: rprb_26071_mme_int_pktmirror_net_1_subnet
vLB_volume_size_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_volume_size_2
type: float
description: The size of the volume in GB.
default: 1
vf_module_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vf_module_id
type: string
description: The VF MODULE ID of the RADCOM System.
qrouter_cluster_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_cluster_name
type: string
description: The component cluster name
default: qrouter_cluster
vprobe_type:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_type
type: string
description: The type of vProbe. MME or SGW.
default: mme
base_image_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: base_image_name
type: string
description: The base ID or name of the image to boot with
default: rprb_centos_6_7_05_24_2016
vf_module_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vf_module_name
type: string
description: The VNF module name for vProbe elements.
vLB_node_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_node_count
type: float
description: The number of nodes to create.
default: 1
packet_mirror_network_subnet_alloc_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_mirror_network_subnet_alloc_end
type: string
description: End address for the allocation pool
default: 20.20.5.250
packet_internal_network_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_name
type: string
description: The name of the subnet
default: rprb_26071_mme_int_pktinternal_net_1_subnet
vProbe_version_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vProbe_version_name
type: string
description: The version name of the component
default: vProbe.r.11.1.e._08_16-12_53
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: The VNF ID of the RADCOM System.
availability_zone_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: Name of the availability zone for server placement
region_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: region_name
type: string
description: Name of region to be used
availability_zone_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: availability_zone_1
type: string
description: Name of the availability zone for server placement
qtrace_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qtrace_name_0
type: string
description: VM Name for QRouter VMs
availability_zone_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: availability_zone_2
type: string
description: Name of the availability zone for server placement.
vprobe_AppDependenciesMachineType:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_AppDependenciesMachineType
type: string
description: The application dependencies
default: DatabaseUpgrade
manager_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: manager_name_0
type: string
description: VM Name for Manager VM 0
availability_zone_3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: availability_zone_3
type: string
description: Name of the availability zone for server placement
vLB_cluster_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_cluster_name
type: string
description: The component cluster name.
default: vLB_cluster
packet_internal_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_internal_network_name
type: string
description: A string specifying a symbolic name for the network
default: rprb_26071_mme_int_pktinternal_net_1
packet_mirror_network_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_mirror_network_name
type: string
description: A string specifying a symbolic name for the network
default: rprb_26071_mme_int_pktmirror_net_1
packet_internal_network_subnet_alloc_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_alloc_start
type: string
description: Start address for the allocation pool
default: 192.0.6.2
qrouter_volume_type_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_type_1
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vLBAgent_node_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_node_count
type: float
description: The number of nodes to create
default: 1
qrouter_volume_type_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_type_2
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
vprobe_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vprobe_names
type: list
description: VM Names for vProbe VMs
entry_schema:
@@ -455,18 +1063,42 @@ topology_template:
qrouter_node_count:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_node_count
type: float
description: The number of nodes to create
default: 1
qrouter_volume_name_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_name_2
type: string
description: The name of the volume
default: config
vLBAgent_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLBAgent_names
type: list
description: VM Names for vLBAgent VMs
entry_schema:
@@ -474,59 +1106,139 @@ topology_template:
vLB_flavor_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: vLB_flavor_name
type: string
description: The name of the flavor to boot onto.
default: m1.large
qrouter_volume_name_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_name_1
type: string
description: The name of the volume
default: log
qrouter_volume_name_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_name_0
type: string
description: The name of the volume
default: data
qrouter_volume_type_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_type_0
type: string
description: The type of the volume mapping to a backend
default: volumes_ceph
qrouter_volume_size_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_size_0
type: float
description: The size of the volume in GB
default: 1
qrouter_volume_size_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_size_1
type: float
description: The size of the volume in GB
default: 1
packet_internal_network_subnet_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: packet_internal_network_subnet_cidr
type: string
description: The Classless Inter-Domain Routing
default: 192.0.6.0/24
manager_oam_direct_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: manager_oam_direct_ip_0
type: string
description: The public ip address of the manager
qrouter_volume_size_2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: qrouter_volume_size_2
type: float
description: The size of the volume in GB
default: 1
rpmrepository_ip_0:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - FEBase_Module
+ source_type: HEAT
+ param_name: rpmrepository_ip_0
type: string
description: The public ip address of the repository
node_templates:
@@ -1066,4 +1778,4 @@ topology_template:
- packet_internal_network
- security_group
- QRouter0
- - vLB \ No newline at end of file
+ - vLB
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
index aed01b886e..b1b1213804 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,11 +12,27 @@ topology_template:
security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: security_group_id1
type: string
description: UID of OAM network
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:
@@ -24,53 +40,133 @@ topology_template:
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
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
security_group_name:
label: 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: the name of security group
security_group_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: security_group_id
type: string
description: UID of OAM network
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
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
description: cmaui_oam_ips
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
security_group_id3:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: security_group_id3
type: string
description: UID of OAM network
security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: security_group_id2
type: string
description: UID of OAM network
node_templates:
@@ -368,4 +464,4 @@ topology_template:
- cmaui_port_2
- server_cmaui
- cmaui_port_1
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
index b656ef8c37..d5095b90f9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,11 +12,27 @@ topology_template:
label: 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: the name of security group
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:
@@ -195,4 +211,4 @@ topology_template:
members:
- jsa_security_group1
- jsa_security_group2
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml
index 58b238e8e7..cb8aeec2d5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,21 +12,55 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
shared_security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_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
shared_security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_id1
type: string
description: network name of jsa log network
node_templates:
@@ -226,4 +260,4 @@ topology_template:
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- test_nestedArrayParam
- - test_nested \ No newline at end of file
+ - test_nested
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
index d3f98b3c71..86afc22c02 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml
@@ -14,28 +14,77 @@ topology_template:
shared_test_nova:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_nova
type: string
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
security_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: network name of jsa log network
shared_test_group2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_test_group2
type: string
jsa_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - base
+ source_type: HEAT
+ param_name: jsa_net_name
type: string
description: network name of jsa log network
jsa_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - base
+ source_type: HEAT
+ param_name: jsa_name
type: string
node_templates:
test_nested1Level:
@@ -296,4 +345,4 @@ topology_template:
members:
- test_nested1Level
- test_nestedInvalidConnectionToNova
- - test_resourceGroup \ No newline at end of file
+ - test_resourceGroup
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
index a7a2b36685..858678549e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,21 +12,55 @@ topology_template:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ - main
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
shared_security_group_id2:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_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
shared_security_group_id1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - addOn
+ source_type: HEAT
+ param_name: shared_security_group_id1
type: string
description: network name of jsa log network
node_templates:
@@ -216,4 +250,4 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - mvs_modules \ No newline at end of file
+ - mvs_modules
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 f7b9271877..a9d7c6b6ec 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
@@ -14,6 +14,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -21,22 +29,62 @@ topology_template:
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ 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:
+ - main
+ 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:
+ - main
+ 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:
+ - main
+ 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:
+ - main
+ source_type: HEAT
+ param_name: security_group_name
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -44,44 +92,116 @@ 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
vlan_ids:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: vlan_ids
type: string
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ 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:
+ - main
+ 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:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
lb_st_vlan_type_oam:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ 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:
+ - main
+ 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:
+ - 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
node_templates:
cmaui_port_2:
@@ -319,4 +439,4 @@ topology_template:
- test_Vlan2
- test_Vlan1
- server_cmaui_nova
- - test_nested \ No newline at end of file
+ - test_nested
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 87cb0f7799..7cef7ff372 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
@@ -14,6 +14,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -21,28 +29,76 @@ topology_template:
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
template_PortTuple_LB1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: template_PortTuple_LB1
type: string
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_sec_group_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ 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:
+ - main
+ source_type: HEAT
+ param_name: lb_st_interface_type_oam
type: string
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: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -51,24 +107,64 @@ topology_template:
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
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:
@@ -289,4 +385,4 @@ topology_template:
- test_resourceGroup
- test_net1
- test_nestedInvalidConnection
- - server_cmaui_nova \ No newline at end of file
+ - server_cmaui_nova
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
index 458fc29876..7ca5c8d941 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml
@@ -26,367 +26,887 @@ topology_template:
Internal2_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_name
type: string
default: Internal2-subnet
vlc2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-Internal2-mac
type: string
description: static mac address assigned to vlc2-Internal2
default: 00:81:37:0E:02:12
epc-sctp-a-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-rt
type: string
description: epc-sctp-a route target
default: 13979:105717
epc-sctp-b-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-rt
type: string
description: epc-sctp-b route target
default: 13979:105719
gpb-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb-flavor
type: string
description: Flavor to use for servers gpb
default: m4.xlarge4
Internal1_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_cidr
type: string
default: 169.253.0.0/17
epc-sctp-a-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-pool-start
type: string
description: epc-sctp-a-net network ip pool start IP address
default: 107.243.37.3
Internal2_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_subnet_name
type: string
default: vmme_int_int_sub_2
Internal1_subnet_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_subnet_name
type: string
default: vmme_int_int_sub_1
gpb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal1-mac
type: string
description: static mac address assigned to gpb1-Internal1
default: 00:80:37:0E:01:22
gpb1-Internal1-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal1-ip
type: string
default: 169.254.0.101
FSB_1_image:
label: MME_FSB1
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: FSB_1_image
type: string
description: MME_FSB1_15B-CP04-r5a01
default: MME_FSB1_15B-CP04-r5a01
fsb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-Internal2-mac
type: string
description: static mac address assigned to fsb1-Internal2
default: 00:81:37:0E:0B:12
ncb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb_zone
type: string
description: cluster for spawnning ncb instances
default: nova
Internal2_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_name
type: string
default: vmme_int_int_2
epc-sctp-a-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-pool-end
type: string
description: epc-sctp-a-net network ip pool end IP address
default: 107.243.37.30
Internal1_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_name
type: string
default: Internal1-subnet
gpb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-name
type: string
description: Name of gpb2
default: ZRDM1MMEX33GPB002
fsb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-Internal1-mac
type: string
description: static mac address assigned to fsb2-Internal1
default: 00:80:37:0E:0D:12
fsb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-name
type: string
description: Name of fsb1
default: ZRDM1MMEX33FSB002
static_prefix_sctp_b_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_sctp_b_1
type: string
description: Static Prefix
default: 107.239.40.64/30
fsb2-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-oam-ip
type: string
default: 107.250.172.222
fsb2-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-flavor
type: string
description: Flavor to use for servers fsb2
default: m4.xlarge4
fsb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-Internal2-mac
type: string
description: static mac address assigned to fsb2-Internal2
default: 00:81:37:0E:0D:12
ncb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-Internal1-mac
type: string
description: static mac address assigned to ncb2-Internal1
default: 00:80:37:0E:0F:12
ncb2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-name
type: string
description: Name of ncb2
default: ZRDM1MMEX33NCB002
epc-sctp-b-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-pool-end
type: string
description: epc-sctp-b-net network ip pool end IP address
default: 107.243.37.62
vlc1-gtp-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-gtp-ip
type: string
default: 107.243.37.67
epc-sctp-b-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-pool-start
type: string
description: epc-sctp-b-net network ip pool start IP address
default: 107.243.37.35
Internal2_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_shared
type: string
default: 'False'
Internal1_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_name
type: string
default: vmme_int_int_1
vlc2-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-name
type: string
description: Name of vlc2
default: ZRDM1MMEX33VLC002
Internal2_ipam_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_ipam_name
type: string
default: vmme_ipam_int2
vlc1-sctp-b-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-sctp-b-ip
type: string
default: 107.243.37.35
Internal1_net_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_pool_end
type: string
default: 169.253.0.254
Internal1_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_default_gateway
type: string
default: 169.253.0.3
ncb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-Internal1-mac
type: string
description: static mac address assigned to ncb1-Internal1
default: 00:80:37:0E:09:12
epc-gtp-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-name
type: string
description: gtp net name
default: EPC-GTP
vlc1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-Internal1-mac
type: string
description: static mac address assigned to vlc1-Internal1
default: 00:80:37:0E:01:12
gpb2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-Internal1-mac
type: string
description: static mac address assigned to gpb2-Internal1
default: 00:80:37:0E:02:22
epc-gtp-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-cidr
type: string
description: gtp stubnet
default: 107.243.37.64/27
oam_net_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: oam_net_id
type: string
description: uuid of oam network
default: 47bf4cca-0961-422f-bcd6-d5a4fbb1a351
vlc_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc_zone
type: string
description: cluster for spawnning vlc instances
default: nova
vlc2-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-Internal1-mac
type: string
description: static mac address assigned to vlc2-Internal1
default: 00:80:37:0E:02:12
epc-sctp-a-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-cidr
type: string
description: epc-sctp-a subnet
default: 107.243.37.0/27
Internal1_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_forwarding_mode
type: string
default: l2
Internal2_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_dhcp
type: boolean
default: false
fsb1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-oam-ip
type: string
default: 107.250.172.221
FSB_2_image:
label: MME_FSB2
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: FSB_2_image
type: string
description: MME_FSB2_15B-CP04-r5a01
default: MME_FSB2_15B-CP04-r5a01
vlc1-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-oam-ip
type: string
default: 107.250.172.227
epc-sctp-a-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-name
type: string
description: epc-sctp-a net name
default: EPC-SCTP-A
vlc2-oam-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-oam-ip
type: string
default: 107.250.172.228
Internal2_net_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_pool_start
type: string
default: 169.255.0.100
FSB1_volume_name:
label: FSB1_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: FSB1_volume_name
type: string
description: FSB1_volume_1
default: vFSB1_1_Vol_1
vlc1-sctp-a-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-sctp-a-ip
type: string
default: 107.243.37.3
Internal1_ipam_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_ipam_name
type: string
default: vmme_ipam_int1
Internal1_dhcp:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_dhcp
type: boolean
default: false
Internal2_external:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_external
type: string
default: 'False'
Internal2_forwarding_mode:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_forwarding_mode
type: string
default: l2
vlc1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-name
type: string
description: Name of vlc1
default: ZRDM1MMEX33VLC002
vlc-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc-flavor
type: string
description: Flavor to use for servers vlc
default: m4.xlarge4
epc-gtp-net-rt:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-rt
type: string
description: gtp route target
default: 13979:105715
gpb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb_zone
type: string
description: cluster for spawnning gpb instances
default: nova
gpb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-Internal2-mac
type: string
description: static mac address assigned to gpb1-Internal2
default: 00:81:37:0E:01:22
fsb1-Internal1-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-Internal1-mac
type: string
description: static mac address assigned to fsb1-Internal1
default: 00:80:37:0E:0B:12
@@ -394,136 +914,328 @@ topology_template:
label: FSB2_volume
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: FSB2_volume_name
type: string
description: FSB2_volume_1
default: vFSB2_1_Vol_1
VMME_FSB2_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: VMME_FSB2_boot_volume
type: string
default: 089a0d11-4b15-4370-8343-3f90907b1221
fsb_zone:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb_zone
type: string
description: cluster for spawnning fsb instances
default: nova
VMME_FSB1_boot_volume:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: VMME_FSB1_boot_volume
type: string
default: 8248e794-6173-4b49-b9c3-8219b0b56f4e
Internal2_default_gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_default_gateway
type: string
default: 169.255.0.3
Internal1_external:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_external
type: string
default: 'False'
vlc2-sctp-a-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-sctp-a-ip
type: string
default: 107.243.37.4
ncb-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb-flavor
type: string
description: Flavor to use for servers ncb
default: m4.xlarge4
Internal1_shared:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_shared
type: string
default: 'False'
fsb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-name
type: string
description: Name of fsb1
default: ZRDM1MMEX33FSB001
static_prefix_gtp_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_gtp_1
type: string
description: Static Prefix
default: 107.239.40.96/30
epc-sctp-b-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-gateway
type: string
description: epc-sctp-b-net network gateway
default: 107.243.37.33
epc-sctp-b-net-cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-cidr
type: string
description: epc-sctp-b subnet
default: 107.243.37.32/24
epc-gtp-pool-end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-pool-end
type: string
description: gtp network ip pool end IP address
default: 107.243.37.94
epc-sctp-a-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-a-net-gateway
type: string
description: epc-sctp-a-net network gateway
default: 107.243.37.1
vlc2-gtp-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-gtp-ip
type: string
default: 107.243.37.68
vlc2-sctp-b-ip:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc2-sctp-b-ip
type: string
default: 107.243.37.36
Internal1_net_pool_start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal1_net_pool_start
type: string
default: 169.253.0.100
volume_size:
label: volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: volume_size
type: float
description: my volume size 320GB
default: 320
fsb2-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb2-image
type: string
description: Name of image to use for server fsb2
default: MME_FSB2_15B-CP04-r5a01
ncb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb2-Internal2-mac
type: string
description: static mac address assigned to ncb2-Internal2
default: 00:81:37:0E:0F:12
ncb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-name
type: string
description: Name of ncb1
default: ZRDM1MMEX33NCB001
fsb1-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-image
type: string
description: Name of image to use for server fsb1
default: MME_FSB1_15B-CP04-r5a01
fsb1-flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: fsb1-flavor
type: string
description: Flavor to use for servers fsb1
default: m4.xlarge4
@@ -531,70 +1243,166 @@ topology_template:
label: volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small_create_fsb
+ source_type: HEAT
+ param_name: volume_type
type: string
description: volume type Gold
default: Gold
Internal2_net_pool_end:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_net_pool_end
type: string
default: 169.255.0.254
epc-sctp-b-net-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-sctp-b-net-name
type: string
description: epc-sctp-b net name
default: EPC-SCTP-B
Internal2_cidr:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: Internal2_cidr
type: string
default: 169.255.0.0/17
epc-gtp-net-gateway:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-net-gateway
type: string
description: gtp network gateway
default: 107.243.37.65
gpb2-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb2-Internal2-mac
type: string
description: static mac address assigned to gpb2-Internal2
default: 00:81:37:0E:02:22
ncb1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: ncb1-Internal2-mac
type: string
description: static mac address assigned to ncb1-Internal2
default: 00:81:37:0E:09:12
epc-gtp-pool-start:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: epc-gtp-pool-start
type: string
description: gtp network ip pool start IP address
default: 107.243.37.67
static_prefix_sctp_a_1:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: static_prefix_sctp_a_1
type: string
description: Static Prefix
default: 107.239.40.32/30
gpb1-name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: gpb1-name
type: string
description: Name of gpb1
default: ZRDM1MMEX33GPB001
pxe-image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: pxe-image
type: string
description: Name of image to use for server ncb
default: MME_PXE-BOOT_cxp9025898_2r5a01.qcow2
vlc1-Internal2-mac:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - vmme_small
+ source_type: HEAT
+ param_name: vlc1-Internal2-mac
type: string
description: static mac address assigned to vlc1-Internal2
default: 00:81:37:0E:01:12
@@ -1478,4 +2286,4 @@ topology_template:
description: server template for vMME
members:
- FSB1_volume
- - FSB2_volume \ No newline at end of file
+ - FSB2_volume
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/MainServiceTemplate.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/MainServiceTemplate.yaml
index b0c76462ac..b44cb69060 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/MainServiceTemplate.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/MainServiceTemplate.yaml
@@ -11,6 +11,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -19,58 +27,138 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: 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: the name of security group
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
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 VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
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:
label: CMAUI oam_net IP addresses
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: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -79,23 +167,55 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
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: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - main
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -123,4 +243,4 @@ topology_template:
heat_file: ../Artifacts/main.yml
description: cmaui server template for vMMSC
members:
- - server_cmaui_1 \ No newline at end of file
+ - server_cmaui_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
index e7b988d9b4..acd332331a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -20,64 +28,152 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
server_cmaui:
label: CMAUI server name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: server_cmaui
type: string
description: the name of the cmaui server
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
availability_zone_0:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -86,23 +182,55 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -177,4 +305,4 @@ topology_template:
members:
- server_cmaui
- cmaui_volume
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
index 3be0013f74..57a526f5bc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -20,64 +28,153 @@ topology_template:
label: CMAUI volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: exposed_cmaui_volume
type: float
description: the size of the CMAUI volume
cmaui_cinder_volume_size:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
availability_zone_0:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -86,23 +183,56 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - hot_template
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -186,4 +316,4 @@ topology_template:
- cmaui_port_0
outputs:
exposed_cmaui_volume:
- value: cmaui_volume \ No newline at end of file
+ value: cmaui_volume
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
index b449a90a34..070dda7a32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml
@@ -12,6 +12,14 @@ topology_template:
cmaui_names:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_names
type: list
description: CMAUI1, CMAUI2 server names
entry_schema:
@@ -20,64 +28,153 @@ topology_template:
label: CMAUI Cinder volume size
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_cinder_volume_size
type: float
description: the size of the CMAUI Cinder volume
timezone:
label: timezone
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: timezone
type: string
description: timezone
security_group_name:
label: security group name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: security_group_name
type: string
description: the name of security group
cmaui_volume:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_volume
type: string
description: the name of the target volume backend
oam_network_netmask:
label: oam network netmask
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_netmask
type: string
description: oam network gateway
cmaui_image:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_image
type: string
description: Image for CMAUI server
vnf_id:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: vnf_id
type: string
description: Unique ID for this VNF instance
default: This_is_ths_MMSC-CMAUI_id
cmaui_flavor:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_flavor
type: string
description: Flavor for CMAUI server
oam_network_gateway:
label: oam network gateway
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_network_gateway
type: string
description: oam network gateway
availability_zone_0:
label: availabilityzone name
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: availability_zone_0
type: string
description: availabilityzone name
cmaui_oam_ips:
label: CMAUI oam_net IP addresses
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: cmaui_oam_ips
type: list
description: CMAUI oam_net IP addresses
entry_schema:
@@ -86,23 +183,56 @@ topology_template:
label: dns server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_dns
type: string
description: dns server
oam_net_name:
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: oam_net_name
type: string
description: UID of OAM network
external_ntp:
label: ntp server
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - hot_template
+ source_type: HEAT
+ param_name: external_ntp
type: string
description: ntp server
CMAUI_volume_type:
label: CMAUI vm volume type
hidden: false
immutable: false
+ annotations:
+ source:
+ type: org.openecomp.annotations.Source
+ properties:
+ vf_module_label:
+ - a_vol
+ - hot_template
+ source_type: HEAT
+ param_name: CMAUI_volume_type
type: string
description: the name of the target volume backend
node_templates:
@@ -172,4 +302,4 @@ topology_template:
description: cmaui server template for vMMSC
members:
- server_cmaui
- - cmaui_port_0 \ No newline at end of file
+ - cmaui_port_0
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java
new file mode 100644
index 0000000000..5fc5c1f710
--- /dev/null
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/datatypes/extend/ToscaAnnotationType.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openecomp.sdc.tosca.datatypes.extend;
+
+import org.openecomp.config.api.Configuration;
+import org.openecomp.config.api.ConfigurationManager;
+import org.openecomp.sdc.tosca.services.ConfigConstants;
+
+
+public class ToscaAnnotationType {
+
+ private static Configuration config = ConfigurationManager.lookup();
+ public static final String ANNOTATION_TYPE_PREFIX =
+ config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_ANNOTATION_TYPE);
+
+ public static final String SOURCE =
+ ANNOTATION_TYPE_PREFIX + "Source";
+
+}
+
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ConfigConstants.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ConfigConstants.java
index 91103c55df..8666da9833 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ConfigConstants.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ConfigConstants.java
@@ -1,21 +1,17 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.tosca.services;
@@ -32,6 +28,7 @@ public class ConfigConstants {
public static final String PREFIX_POLICY_TYPE = PREFIX + ".policyType";
public static final String PREFIX_ARTIFACT_TYPE = PREFIX + ".artifactType";
public static final String PREFIX_RELATIONSHIP_TYPE = PREFIX + ".relationshipType";
+ public static final String PREFIX_ANNOTATION_TYPE = PREFIX + ".annotationType";
public static final String PREFIX_NODE_TYPE_VFC = PREFIX + ".nodeType.vfc";
public static final String PREFIX_NODE_TYPE_NETWORK = PREFIX + ".nodeType.network";
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaConstants.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaConstants.java
index 4d45e8fbf1..1aa171961f 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaConstants.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/services/ToscaConstants.java
@@ -1,21 +1,17 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.tosca.services;
@@ -42,6 +38,9 @@ public class ToscaConstants {
public static final String FEATURE_CAPABILITY_ID = "feature";
public static final String PORT_MIRRORING_CAPABILITY_ID = "port_mirroring";
+ //TOSCA Annotation Ids
+ public static final String SOURCE_ANNOTATION_ID = "source";
+
//General
public static final String TOSCA_DEFINITIONS_VERSION = "tosca_simple_yaml_1_0_0";
public static final String MODELABLE_ENTITY_NAME_SELF = "SELF";
@@ -70,5 +69,13 @@ public class ToscaConstants {
public static final String COMPUTE_IMAGE = "image";
public static final String COMPUTE_FLAVOR = "flavor";
+ public static final String SOURCE_TYPE_PROPERTY_NAME = "source_type";
+ public static final String VF_MODULE_LABEL_PROPERTY_NAME = "vf_module_label";
+ public static final String PARAM_NAME_PROPERTY_NAME = "param_name";
+
+ // propertiies valid values
+ public static final String HEAT_SOURCE_TYPE = "HEAT";
+ public static final String GENERIC_SOURCE_TYPE = "Generic";
+
}
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/resources/config.properties b/openecomp-be/lib/openecomp-tosca-lib/src/main/resources/config.properties
index 3b90c809fa..02428bb822 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/main/resources/config.properties
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/resources/config.properties
@@ -5,6 +5,7 @@ tosca.entity.namespace.prefix.groupType=${tosca.entity.namespace.prefix}groups.
tosca.entity.namespace.prefix.policyType=${tosca.entity.namespace.prefix}policies.
tosca.entity.namespace.prefix.relationshipType=${tosca.entity.namespace.prefix}relationships.
tosca.entity.namespace.prefix.monitoringUploadType=${tosca.entity.namespace.prefix}artifacts.
+tosca.entity.namespace.prefix.annotationType=${tosca.entity.namespace.prefix}annotations.
tosca.entity.namespace.prefix.nodeType.vfc=${tosca.entity.namespace.prefix}resource.vfc.nodes.
tosca.entity.namespace.prefix.nodeType.network=${tosca.entity.namespace.prefix}resource.vl.nodes.