aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentQuestionnaireHealer.java8
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/SubEntitiesQuestionnaireHealer.java12
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ValidationStructureHealer.java5
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java17
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java50
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml1068
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/pom.xml75
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/tosca/datatypes/AttToscaPolicyType.java23
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImpl.java301
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaMapping.json15
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaTranslator.json13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-override-heatToToscaTranslator.json36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java326
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImplTest.java167
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/logback.xml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/expectedoutputfiles/MainServiceTemplate.yaml304
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/main.yml144
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/expectedoutputfiles/MainServiceTemplate.yaml292
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/main.yml124
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/expectedoutputfiles/MainServiceTemplate.yaml303
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/main.yml132
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/expectedoutputfiles/MainServiceTemplate.yaml202
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/main.yml111
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/expectedoutputfiles/MainServiceTemplate.yaml610
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/MANIFEST.json28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.env14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.yaml318
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.env28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.yaml299
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/expectedoutputfiles/MainServiceTemplate.yaml292
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/main.yml132
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/expectedoutputfiles/MainServiceTemplate.yaml209
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/main.yml88
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/expectedoutputfiles/MainServiceTemplate.yaml209
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/main.yml96
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/expectedoutputfiles/MainServiceTemplate.yaml209
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/main.yml103
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/expectedoutputfiles/MainServiceTemplate.yaml210
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/main.yml91
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/expectedoutputfiles/MainServiceTemplate.yaml209
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/MANIFEST.json12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/main.yml90
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/pom.xml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttHeatResourceTypes.java53
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerErrorDescription.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerTargetServiceName.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttValetGroupTypeValues.java53
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidator.java60
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/messages/Messages.java20
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/resources/config-merge-validaton.json18
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidatorTest.java59
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.yaml17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java3
-rw-r--r--openecomp-be/pom.xml2
72 files changed, 1012 insertions, 6585 deletions
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentQuestionnaireHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentQuestionnaireHealer.java
index d061556e4c..4dadb97f71 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentQuestionnaireHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ComponentQuestionnaireHealer.java
@@ -19,6 +19,7 @@ import org.openecomp.sdc.versioning.dao.types.Version;
import java.util.Collection;
import java.util.Map;
+import java.util.Objects;
public class ComponentQuestionnaireHealer implements Healer {
@@ -59,8 +60,10 @@ public class ComponentQuestionnaireHealer implements Healer {
Collection<ComponentEntity> componentEntities =
componentDao.list(new ComponentEntity(vspId, version, null));
componentEntities.forEach(componentEntity -> {
- String questionnaire = componentDao.getQuestionnaireData(vspId, version, componentEntity
- .getId()).getQuestionnaireData();
+ ComponentEntity componentQuestionnaireData =
+ componentDao.getQuestionnaireData(vspId, version, componentEntity.getId());
+ String questionnaire = Objects.isNull(componentQuestionnaireData) ? null
+ : componentQuestionnaireData.getQuestionnaireData();
if (questionnaire != null) {
JsonParser jsonParser = new JsonParser();
@@ -97,7 +100,6 @@ public class ComponentQuestionnaireHealer implements Healer {
* Move Disk Atributes from genral/image/ to genral/disk in component questionnaire itself
* @param json
* @param diskAttrName
- * @param diskJsonObject
* @return
*/
private void processDiskAttribute(JsonObject json, String diskAttrName) {
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/SubEntitiesQuestionnaireHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/SubEntitiesQuestionnaireHealer.java
index 130405be1d..9355eb076f 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/SubEntitiesQuestionnaireHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/SubEntitiesQuestionnaireHealer.java
@@ -55,6 +55,9 @@ public class SubEntitiesQuestionnaireHealer implements Healer {
private static NicDao nicDao = NicDaoFactory.getInstance().createInterface();
private static NetworkDao networkDao = NetworkDaoFactory.getInstance().createInterface();
+ private static String emptyString = "";
+ private static String emptyJson = "{}";
+
@Override
public Object heal(Map<String, Object> healingParams) throws Exception {
@@ -90,8 +93,7 @@ public class SubEntitiesQuestionnaireHealer implements Healer {
for (Object entity : compositionEntities) {
CompositionEntity compositionEntity = (CompositionEntity) entity;
- if (Objects.isNull(compositionEntity.getQuestionnaireData()) ||
- "".equals(compositionEntity.getQuestionnaireData())) {
+ if (isQuestionnaireNeedsToGetHealed(compositionEntity)) {
compositionEntity.setVersion(newVersion);
updateNullQuestionnaire(compositionEntity, type);
}
@@ -100,6 +102,12 @@ public class SubEntitiesQuestionnaireHealer implements Healer {
mdcDataDebugMessage.debugExitMessage(null);
}
+ private boolean isQuestionnaireNeedsToGetHealed(CompositionEntity compositionEntity) {
+ return Objects.isNull(compositionEntity.getQuestionnaireData())
+ || emptyString.equals(compositionEntity.getQuestionnaireData())
+ || emptyJson.equals(compositionEntity.getQuestionnaireData());
+ }
+
private void updateNullQuestionnaire(CompositionEntity entity,
CompositionEntityType type) {
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ValidationStructureHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ValidationStructureHealer.java
index 58ba3b7c35..4bf7e18091 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ValidationStructureHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/ValidationStructureHealer.java
@@ -48,6 +48,11 @@ public class ValidationStructureHealer implements Healer {
UploadDataEntity orchestrationTemplate =
orchestrationTemplateDao.getOrchestrationTemplate(vspId, version);
+ if(Objects.isNull(orchestrationTemplate.getValidationData())
+ || !JsonUtil.isValidJson(orchestrationTemplate.getValidationData())){
+ return Optional.empty();
+ }
+
OldValidationStructureTree oldValidationStructureTree;
try{
oldValidationStructureTree =
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java
index 4accd790ab..085923b8a0 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/main/java/org/openecomp/sdc/healing/healers/VlmVersionHealer.java
@@ -1,5 +1,6 @@
package org.openecomp.sdc.healing.healers;
+import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.sdc.common.utils.SdcCommon;
import org.openecomp.sdc.healing.interfaces.Healer;
import org.openecomp.sdc.logging.api.Logger;
@@ -15,6 +16,7 @@ import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDaoFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.types.VersionInfo;
import java.util.ArrayList;
import java.util.List;
@@ -60,7 +62,7 @@ public class VlmVersionHealer implements Healer {
VendorLicenseModelEntity vlm = vendorLicenseModel.getVendorLicenseModel();
String vlmId = vlm.getId();
- Version vlmVersion = vlm.getVersion();
+ Version vlmVersion = getLatestFinalVlmVersion(vendorLicenseModel.getVersionInfo());
List<LicenseAgreementEntity> laList =
new ArrayList<>(
@@ -68,12 +70,19 @@ public class VlmVersionHealer implements Healer {
vspDetails.setVlmVersion(vlmVersion);
- vspDetails.setLicenseAgreement(laList.get(0).getId());
- vspDetails.setFeatureGroups(new ArrayList<>(laList.get(0).getFeatureGroupIds()));
- vspInfoDao.update(vspDetails);
+ if(CollectionUtils.isNotEmpty(laList)) {
+ vspDetails.setLicenseAgreement(laList.get(0).getId());
+ vspDetails.setFeatureGroups(new ArrayList<>(laList.get(0).getFeatureGroupIds()));
+ }
+ vspInfoDao.update(vspDetails);
return vspDetails;
}
+
+ private Version getLatestFinalVlmVersion(VersionInfo versionInfo){
+ return versionInfo.getActiveVersion().isFinal() ? versionInfo.getActiveVersion()
+ : versionInfo.getLatestFinalVersion();
+ }
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
index 2fe1416ffc..705773d1fc 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
@@ -9,27 +9,34 @@ import org.apache.commons.collections4.MapUtils;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.impl.tosca.model.PortMirroringConnectionPointDescription;
import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
+import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes;
import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.CapabilityAssignment;
import org.openecomp.sdc.tosca.datatypes.model.Import;
import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
+import org.openecomp.sdc.tosca.datatypes.model.NodeType;
import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.services.DataModelUtil;
+import org.openecomp.sdc.tosca.services.ToscaAnalyzerService;
import org.openecomp.sdc.tosca.services.ToscaConstants;
import org.openecomp.sdc.tosca.services.ToscaUtil;
+import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
import java.util.stream.Collectors;
public class PortMirroringEnricher {
@@ -186,40 +193,40 @@ public class PortMirroringEnricher {
addPortMirroringSubstitutionMappingCapability(serviceTemplate,
externalPortNodeTemplateId);
}
- handleExternalPortProperties(externalNodeTemplate.getValue());
+ handleExternalPortProperties(externalNodeTemplate.getValue(), serviceTemplate, toscaServiceModel);
}
addGlobalTypeImport(serviceTemplate);
}
}
}
- private void handleExternalPortProperties(NodeTemplate portNodeTemplate) {
+ private void handleExternalPortProperties(NodeTemplate portNodeTemplate,
+ ServiceTemplate serviceTemplate,
+ ToscaServiceModel toscaServiceModel){
- ServiceTemplate serviceTemplate = globalTypesServiceTemplate.get("openecomp/nodes.yml");
+ ToscaAnalyzerService toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
String externalPortType = portNodeTemplate.getType();
Map<String, PropertyDefinition> globalTypesportProperties = new HashMap<>();
- globalTypesportProperties.putAll(
- serviceTemplate.getNode_types().get("org.openecomp.resource.cp.nodes.network.Port")
- .getProperties());
- globalTypesportProperties
- .putAll(serviceTemplate.getNode_types().get(externalPortType).getProperties());
+ NodeType flatNodeType =
+ (NodeType) toscaAnalyzerService.getFlatEntity(ToscaElementTypes.NODE_TYPE, externalPortType, serviceTemplate, toscaServiceModel);
+ globalTypesportProperties.putAll(flatNodeType.getProperties());
Map<String, Object> properties = portNodeTemplate.getProperties();
Map<String, Object> filteredProperties = new HashMap<>();
- if (MapUtils.isEmpty(properties)) {
+ if(MapUtils.isEmpty(properties)){
return;
}
- for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) {
- if (globalTypesportProperties.containsKey(propertyEntry.getKey())) {
+ for(Map.Entry<String, Object> propertyEntry: properties.entrySet()){
+ if(globalTypesportProperties.containsKey(propertyEntry.getKey())){
filteredProperties.put(propertyEntry.getKey(), propertyEntry.getValue());
}
}
- if (!MapUtils.isEmpty(filteredProperties)) {
+ if(!MapUtils.isEmpty(filteredProperties)) {
portNodeTemplate.setProperties(filteredProperties);
- } else {
+ }else{
portNodeTemplate.setProperties(null);
}
@@ -284,14 +291,15 @@ public class PortMirroringEnricher {
private boolean isPortNodeTemplate(String nodeType) {
//Check if node corresponds to a concrete port node
- if (Objects.nonNull(nodeType)) {
- if (nodeType.equals(ToscaNodeType.NEUTRON_PORT)
- || nodeType.equals(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE)
- || nodeType.equals(ToscaNodeType.CONTRAIL_PORT)) {
- return true;
- }
- }
- return false;
+ Set<String> portNodeTypes = getPortNodeTypes();
+ return Objects.nonNull(nodeType)
+ && portNodeTypes.contains(nodeType);
+ }
+
+ private Set<String> getPortNodeTypes(){
+ return new HashSet<>(Arrays.asList(ToscaNodeType.NEUTRON_PORT,
+ ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE,
+ ToscaNodeType.CONTRAIL_PORT));
}
private boolean isSubstitutableNodeTemplate(NodeTemplate nodeTemplate) {
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
index 83516a22ba..810bf304c1 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
@@ -1,308 +1,316 @@
+#
+# 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_openecomp_1_0
+
metadata:
filename: openecomp/nodes.yml
version: '1.0'
+
imports:
- openecomp_index:
file: _index.yml
+
node_types:
- org.openecomp.resource.vl.nodes.network.VL:
+
+ org.openecomp.resource.vl.nodes.network.Network:
derived_from: tosca.nodes.network.Network
properties:
vendor:
type: string
required: false
- status: SUPPORTED
vl_name:
type: string
required: false
- status: SUPPORTED
capabilities:
end_point:
type: tosca.capabilities.Endpoint
- occurrences:
- - 1
- - UNBOUNDED
+
org.openecomp.resource.abstract.nodes.AbstractSubstitute:
derived_from: tosca.nodes.Root
properties:
service_template_filter:
- type: org.openecomp.datatypes.substitution.SubstitutionFiltering
description: Substitution Filter
- required: true
+ type: org.openecomp.datatypes.substitution.SubstitutionFiltering
status: SUPPORTED
+ required: true
+
org.openecomp.resource.vl.extVL:
- derived_from: org.openecomp.resource.vl.nodes.network.VL
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
description: VF Tenant oam protected network
properties:
network_type:
- type: string
description: OPENECOMP supported network types.
+ type: string
required: true
- status: SUPPORTED
network_role:
- type: string
description: |
Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network
+ type: string
required: true
- status: SUPPORTED
network_scope:
- type: string
description: |
Uniquely identifies the network scope. Valid values for the network scope includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects the VFs within the service GLOBAL - Global network which can be shared by multiple services
- required: true
- status: SUPPORTED
+ type: string
constraints:
- valid_values:
- VF
- SERVICE
- GLOBAL
network_technology:
- type: string
description: OPENECOMP supported network technology
+ type: string
required: true
- status: SUPPORTED
network_ecomp_naming:
type: org.openecomp.datatypes.EcompNaming
required: true
- status: SUPPORTED
network_homing:
type: org.openecomp.datatypes.EcompHoming
required: true
- status: SUPPORTED
network_assignments:
type: org.openecomp.datatypes.network.NetworkAssignments
required: true
- status: SUPPORTED
provider_network:
type: org.openecomp.datatypes.network.ProviderNetwork
required: true
- status: SUPPORTED
network_flows:
type: org.openecomp.datatypes.network.NetworkFlows
required: false
- status: SUPPORTED
+
+
org.openecomp.resource.vfc.nodes.Compute:
derived_from: tosca.nodes.Compute
capabilities:
disk.ephemeral.size:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
instance:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
memory:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.iops:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.read.requests:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
cpu.delta:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.capacity:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.read.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.write.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.latency:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.read.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.usage:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
cpu_util:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.allocation:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.write.requests.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.write.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.latency:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.write.requests:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.write.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.read.requests:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.root.size:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.write.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
vcpus:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.iops:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.usage:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.read.requests.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.write.requests.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.allocation:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.read.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.read.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
memory.usage:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.device.capacity:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
memory.resident:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
disk.write.requests:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
+
org.openecomp.resource.abstract.nodes.DFAbstractSubstitute:
derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
properties:
license_feature_group_ref:
- type: string
description: refrence to license feature group
- required: true
+ type: string
status: SUPPORTED
+ required: true
requirements:
- deployment_flavor:
capability: org.openecomp.capabilities.attachment.DeploymentFlavor
@@ -311,191 +319,222 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+
+ org.openecomp.resource.abstract.nodes.ComplexVFC:
+ derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
+
org.openecomp.resource.abstract.nodes.VFC:
derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
properties:
high_availablity:
- type: string
description: high_availablity
- required: false
+ type: string
status: SUPPORTED
+ required: false
vm_image_name:
- type: string
description: Master image_name volume id
- required: true
+ type: string
status: SUPPORTED
+ required: true
vm_flavor_name:
- type: string
description: Master image_name volume id
- required: true
+ type: string
status: SUPPORTED
+ required: true
nfc_naming_code:
- type: string
description: nfc code for instance naming
+ type: string
+ status: SUPPORTED
required: false
+ nfc_code:
+ type: string
+ description: nfc code
status: SUPPORTED
- vm_type_tag:
+ required: false
+ nfc_function:
type: string
- description: vm type based on naming Convention
+ description: nfc function
+ status: SUPPORTED
required: false
+ vm_type_tag:
+ description: vm type based on naming Convention
+ type: string
status: SUPPORTED
+ required: false
vfc_naming:
- type: org.openecomp.datatypes.Naming
description: vfc naming
- required: false
- default: false
+ type: org.openecomp.datatypes.Naming
status: SUPPORTED
+ default: false
+ required: false
min_instances:
- type: integer
description: Minimum number of VFC Instances
- required: false
- default: 0
+ type: integer
status: SUPPORTED
+ default: 0
+ required: false
constraints:
- greater_or_equal: 0
max_instances:
- type: integer
description: Maximum number of VFC Instances
- required: false
+ type: integer
status: SUPPORTED
+ required: false
constraints:
- greater_or_equal: 1
+
org.openecomp.resource.vl.ELine:
- derived_from: org.openecomp.resource.vl.nodes.network.VL
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
capabilities:
linkable:
type: tosca.capabilities.network.Linkable
occurrences:
- 0
- 2
+
org.openecomp.resource.cp.nodes.network.SubInterface:
derived_from: tosca.nodes.network.Port
+
org.openecomp.resource.vl.internalVL:
- derived_from: org.openecomp.resource.vl.nodes.network.VL
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
description: The AT&T internal (VF-level) Virtual Link
- org.openecomp.resource.cp.nodes.network.CP:
- derived_from: tosca.nodes.network.Port
+
+ org.openecomp.resource.cp.nodes.network.Port:
+ derived_from: tosca.nodes.network.Port
properties:
network_role_tag:
- type: string
description: Must correlate to the set of defined “network-role�? tag identifiers from the associated HEAT template
+ type: string
required: true
- status: SUPPORTED
mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
description: identifies MAC address assignments to the CP
+ type: org.openecomp.datatypes.network.MacRequirements
required: false
- status: SUPPORTED
vlan_requirements:
- type: list
description: identifies vlan address assignments to the CP
- required: false
- status: SUPPORTED
+ type: list
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ required: false
ip_requirements:
- type: list
description: identifies IP requirements to the CP
- required: true
- status: SUPPORTED
+ type: list
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ required: true
+ network_role:
+ description: identical to VL network_role
+ type: string
+ required: false
+ order:
+ description: The order of the CP on the compute instance (e.g. eth2).
+ type: integer
+ required: false
+ exCP_naming:
+ description: CP Name
+ type: org.openecomp.datatypes.Naming
+ required: false
+ subnetpoolid:
+ description: subnet pool id
+ type: string
+ required: false
capabilities:
network.incoming.packets.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.outgoing.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.outgoing.packets.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.outpoing.packets:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.incoming.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.incoming.bytes:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.outgoing.bytes.rate:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
network.incoming.packets:
- type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ type: org.openecomp.capabilities.metric.Ceilometer
occurrences:
- 1
- UNBOUNDED
+
org.openecomp.resource.nodes.DeploymentFlavor:
derived_from: tosca.nodes.Root
capabilities:
deployment_flavor:
- type: org.openecomp.capabilities.attachment.DeploymentFlavor
description: Allowed deployment flavors of an abstract node
+ type: org.openecomp.capabilities.attachment.DeploymentFlavor
occurrences:
- 1
- UNBOUNDED
+
org.openecomp.resource.cp.extCP:
derived_from: tosca.nodes.Root
description: The AT&T Connection Point base type all other CP derive from
properties:
network_role:
- type: string
description: identical to VL network_role
+ type: string
required: true
- status: SUPPORTED
order:
- type: integer
description: The order of the CP on the compute instance (e.g. eth2).
+ type: integer
required: true
- status: SUPPORTED
network_role_tag:
- type: string
description: Must correlate to the set of defined “network-role�? tag identifiers from the associated HEAT template
+ type: string
required: true
- status: SUPPORTED
mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
description: identifies MAC address assignments to the CP
+ type: org.openecomp.datatypes.network.MacRequirements
required: false
- status: SUPPORTED
vlan_requirements:
- type: list
description: identifies vlan address assignments to the CP
- required: false
- status: SUPPORTED
+ type: list
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ required: false
ip_requirements:
- type: list
description: identifies IP requirements to the CP
- required: true
- status: SUPPORTED
+ type: list
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ required: true
+ capabilities:
+ internal_connectionPoint:
+ type: tosca.capabilities.Node
+ valid_source_types:
+ - tosca.nodes.network.Port
requirements:
- virtualLink:
capability: tosca.capabilities.network.Linkable
@@ -505,15 +544,802 @@ node_types:
relationship: tosca.relationships.network.BindsTo
- external_virtualLink:
capability: tosca.capabilities.network.Linkable
- node: org.openecomp.resource.vl.nodes.network.VL
+ node: org.openecomp.resource.vl.nodes.network.Network
relationship: tosca.relationships.network.LinksTo
+
+ org.openecomp.resource.vfc.nodes.volume:
+ derived_from: tosca.nodes.BlockStorage
+
+ ### Node types related to Deployment Flavors
+ org.openecomp.resource.abstract.nodes.VnfConfiguration:
+ derived_from: tosca.nodes.Root
+ description: a container for the available flavors
+ properties:
+ allowed_flavors:
+ description: a collection of all available flavor valuesets
+ type: map
+ entry_schema:
+ type: org.openecomp.datatypes.flavors.DeploymentFlavor
+
+ org.openecomp.resource.abstract.nodes.MultiFlavorVFC:
+ derived_from: org.openecomp.resource.abstract.nodes.VFC
+ description: Multi flavored VFC node
+ properties:
+ images:
+ type: map
+ entry_schema:
+ type: org.openecomp.datatypes.ImageInfo
+ required: false
+
+ ## New node types for Port Mirroring
+ org.openecomp.nodes.ServiceProxy:
+ derived_from: tosca.nodes.Root
+
+ org.openecomp.nodes.PortMirroringConfiguration:
+ derived_from: tosca.nodes.Root
+ requirements:
+ - source:
+ capability: org.openecomp.capabilities.PortMirroring
+ occurrences:
+ - 1
+ - UNBOUNDED
+ - collector:
+ capability: org.openecomp.capabilities.PortMirroring
+ occurrences:
+ - 1
+ - 1
+
+ org.openecomp.resource.cp.v2.extCP:
+ derived_from: org.openecomp.resource.cp.nodes.network.Port
+ description: The SDC External Connection Point base type
capabilities:
- internal_connectionPoint:
- type: tosca.capabilities.Node
- valid_source_types:
- - tosca.nodes.network.Port
+ port_mirroring:
+ type: org.openecomp.capabilities.PortMirroring
+
+ org.openecomp.resource.cp.v2.extNeutronCP:
+ derived_from: org.openecomp.resource.cp.v2.extCP
+ properties:
+ port_security_enabled:
+ type: boolean
+ description: Flag to enable/disable port security on the network
+ required: false
+ status: SUPPORTED
+ device_id:
+ type: string
+ description: Device ID of this port
+ required: false
+ status: SUPPORTED
+ qos_policy:
+ type: string
+ description: The name or ID of QoS policy to attach to this network
+ required: false
+ status: SUPPORTED
+ allowed_address_pairs:
+ type: list
+ description: Additional MAC/IP address pairs allowed to pass through the port
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.AddressPair
+ binding:vnic_type:
+ type: string
+ description: The vnic type to be bound on the neutron port
+ required: false
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - macvtap
+ - direct
+ - normal
+ value_specs:
+ type: map
+ description: Extra parameters to include in the request
+ required: false
+ default: {
+ }
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ device_owner:
+ type: string
+ description: Name of the network owning the port
+ required: false
+ status: SUPPORTED
+ network:
+ type: string
+ description: Network this port belongs to
+ required: false
+ status: SUPPORTED
+ replacement_policy:
+ type: string
+ description: Policy on how to respond to a stack-update for this resource
+ required: false
+ default: AUTO
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - REPLACE_ALWAYS
+ - AUTO
+ security_groups:
+ type: list
+ description: List of security group names or IDs
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ fixed_ips:
+ type: list
+ description: Desired IPs for this port
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ mac_address:
+ type: string
+ description: MAC address to give to this port
+ required: false
+ status: SUPPORTED
+ admin_state_up:
+ type: boolean
+ description: A boolean value specifying the administrative status of the network
+ required: false
+ default: true
+ status: SUPPORTED
+ name:
+ type: string
+ description: A symbolic name for this port
+ required: false
+ status: SUPPORTED
+ attributes:
+ tenant_id:
+ type: string
+ description: Tenant owning the port
+ status: SUPPORTED
+ network_id:
+ type: string
+ description: Unique identifier for the network owning the port
+ status: SUPPORTED
+ qos_policy_id:
+ type: string
+ description: The QoS policy ID attached to this network
+ status: SUPPORTED
+ show:
+ type: string
+ description: Detailed information about resource
+ status: SUPPORTED
+ subnets:
+ type: list
+ description: Subnets of this network
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ status:
+ type: string
+ description: The status of the network
+ status: SUPPORTED
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
occurrences:
- 1
- UNBOUNDED
- org.openecomp.resource.vfc.nodes.volume:
- derived_from: tosca.nodes.BlockStorage
+ binding:
+ type: tosca.capabilities.network.Bindable
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ org.openecomp.resource.cp.v2.extContrailCP:
+ derived_from: org.openecomp.resource.cp.v2.extCP
+ properties:
+ static_routes:
+ type: list
+ description: An ordered list of static routes to be added to this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
+ virtual_network:
+ type: string
+ description: Virtual Network for this interface
+ required: true
+ status: SUPPORTED
+ static_route:
+ type: boolean
+ description: Static route enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ allowed_address_pairs:
+ type: list
+ description: List of allowed address pair for this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.AddressPair
+ shared_ip:
+ type: boolean
+ description: Shared ip enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ ip_address:
+ type: string
+ description: IP for this interface
+ required: false
+ status: SUPPORTED
+ interface_type:
+ type: string
+ description: Interface type
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - management
+ - left
+ - right
+ - other
+ attributes:
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED
+ tosca.nodes.nfv.NS.vEPC_NS:
+ derived_from: tosca.nodes.nfv.NS
+ properties:
+ vendor:
+ default: ChinaMobile
+ required: false
+ type: string
+ csarVersion:
+ default: v1.0
+ required: false
+ type: string
+ name:
+ default: vEPC_NS
+ required: false
+ type: string
+ csarProvider:
+ default: ChinaMobile
+ required: false
+ type: string
+ id:
+ default: vEPC_NS
+ required: false
+ type: string
+ version:
+ default: v1.0
+ required: false
+ type: string
+ csarType:
+ default: NSAR
+ required: false
+ type: string
+ requirements:
+ - virtualLink:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ tosca.nodes.nfv.NS.vIMS_NS:
+ derived_from: tosca.nodes.nfv.NS
+ properties:
+ vendor:
+ default: ChinaMobile
+ required: false
+ type: string
+ csarVersion:
+ default: v1.0
+ required: false
+ type: string
+ name:
+ default: vIMS_NS
+ required: false
+ type: string
+ csarProvider:
+ default: ChinaMobile
+ required: false
+ type: string
+ id:
+ default: vIMS_NS
+ required: false
+ type: string
+ version:
+ default: v1.0
+ required: false
+ type: string
+ csarType:
+ default: NSAR
+ required: false
+ type: string
+ requirements:
+ - virtualLink:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ tosca.nodes.nfv.NS:
+ derived_from: tosca.nodes.Root
+ properties:
+ vendor:
+ required: false
+ type: string
+ name:
+ required: false
+ type: string
+ id:
+ required: false
+ type: string
+ version:
+ required: false
+ type: string
+ requirements:
+ - virtualLink:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ tosca.nodes.nfv.VDU.Compute:
+ attributes:
+ private_address:
+ type: string
+ public_address:
+ type: string
+ networks:
+ type: string
+ ports:
+ type: string
+ capabilities:
+ scalable:
+ type: tosca.capabilities.Scalable
+ virtual_compute:
+ type: tosca.capabilities.nfv.VirtualCompute
+ endpoint:
+ type: tosca.capabilities.Endpoint.Admin
+ os:
+ type: tosca.capabilities.OperatingSystem
+ virtual_binding:
+ type: tosca.capabilities.nfv.VirtualBindable
+ host:
+ type: tosca.capabilities.Container
+ binding:
+ type: tosca.capabilities.network.Bindable
+ monitoring_parameter:
+ type: tosca.capabilities.nfv.Metric
+ derived_from: tosca.nodes.Root
+ properties:
+ configurable_properties:
+ entry_schema:
+ type: tosca.datatypes.nfv.VnfcConfigurableProperties
+ type: map
+ name:
+ type: string
+ nfvi_constraints:
+ entry_schema:
+ type: string
+ required: false
+ type: list
+ descrption:
+ type: string
+ boot_order:
+ entry_schema:
+ type: string
+ required: false
+ type: list
+ requirements:
+ - local_storage:
+ capability: tosca.capabilities.Attachment
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - virtual_storage:
+ capability: tosca.capabilities.nfv.VirtualStorage
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ tosca.nodes.nfv.VDU.VirtualStorage:
+ capabilities:
+ virtual_storage:
+ type: tosca.capabilities.nfv.VirtualStorage
+ derived_from: tosca.nodes.Root
+ properties:
+ id:
+ type: string
+ size_of_storage:
+ type: string
+ rdma_enabled:
+ required: false
+ type: boolean
+ type_of_storage:
+ type: string
+
+ tosca.nodes.nfv.VduCpd:
+ derived_from: tosca.nodes.Root
+ properties:
+ virtual_network_interface_requirements:
+ entry_schema:
+ type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
+ required: false
+ type: list
+ role:
+ constraints:
+ - valid_values:
+ - root
+ - leaf
+ required: false
+ type: string
+ bitrate_requirement:
+ required: false
+ type: integer
+ description:
+ required: false
+ type: string
+ layer_protocol:
+ constraints:
+ - valid_values:
+ - ethernet
+ - mpls
+ - odu2
+ - ipv4
+ - ipv6
+ - pseudo_wire
+ type: string
+ address_data:
+ entry_schema:
+ type: tosca.datatype.nfv.AddressData
+ required: false
+ type: list
+ requirements:
+ - virtual_binding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ tosca.nodes.nfv.ext.ImageFile:
+ capabilities:
+ guest_os:
+ type: tosca.capabilities.nfv.ext.GuestOs
+ image_fle:
+ type: tosca.capabilities.nfv.ext.ImageFile
+ derived_from: tosca.nodes.Root
+ properties:
+ file_url:
+ required: false
+ type: string
+ container_type:
+ required: false
+ type: string
+ name:
+ required: false
+ type: string
+ disk_format:
+ required: false
+ type: string
+ version:
+ required: false
+ type: string
+ tosca.nodes.nfv.ext.LocalStorage:
+ capabilities:
+ local_attachment:
+ type: tosca.capabilities.nfv.ext.LocalAttachment
+ derived_from: tosca.nodes.Root
+ properties:
+ size:
+ required: false
+ type: string
+ disk_type:
+ required: false
+ type: string
+ tosca.nodes.nfv.ext.zte.CP:
+ capabilities:
+ forwarder:
+ type: tosca.capabilities.nfv.Forwarder
+ derived_from: tosca.nodes.Root
+ properties:
+ guest_os_mtu:
+ required: false
+ type: integer
+ bandwidth:
+ required: false
+ type: integer
+ interface_name:
+ required: false
+ type: string
+ allowed_address_pairs:
+ entry_schema:
+ type: tosca.datatypes.nfv.ext.AddressPairs
+ required: false
+ type: list
+ ip_address:
+ required: false
+ type: string
+ bond:
+ required: false
+ type: string
+ proxiedVNFs:
+ entry_schema:
+ type: string
+ required: false
+ type: list
+ sfc_encapsulation:
+ required: false
+ type: string
+ floating_ip_address:
+ required: false
+ type: tosca.datatypes.nfv.ext.FloatingIP
+ service_ip_address:
+ required: false
+ type: string
+ mac_address:
+ required: false
+ type: string
+ proxiedVNFtype:
+ required: false
+ type: string
+ macbond:
+ required: false
+ type: string
+ vnic_type:
+ required: false
+ type: string
+ direction:
+ required: false
+ type: string
+ order:
+ required: false
+ type: integer
+ requirements:
+ - forwarder:
+ capability: tosca.capabilities.nfv.Forwarder
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - virtualbinding:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - virtualLink:
+ capability: tosca.capabilities.nfv.VirtualBindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ tosca.nodes.nfv.ext.zte.VDU:
+ capabilities:
+ scalable:
+ type: tosca.capabilities.Scalable
+ monitoring_parameter:
+ type: tosca.capabilities.nfv.Metric
+ nfv_compute:
+ type: tosca.capabilities.nfv.ext.Compute.Container.Architecture
+ virtualbinding:
+ type: tosca.capabilities.nfv.VirtualBindable
+ derived_from: tosca.nodes.Root
+ properties:
+ manual_scale_select_vim:
+ required: false
+ type: boolean
+ vdu_type:
+ required: false
+ type: string
+ watchdog:
+ required: false
+ type: tosca.datatypes.nfv.ext.zte.WatchDog
+ name:
+ required: false
+ type: string
+ local_affinity_antiaffinity_rule:
+ required: false
+ type: tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule
+ support_scaling:
+ required: false
+ type: boolean
+ storage_policy:
+ required: false
+ type: string
+ key_vdu:
+ required: false
+ type: boolean
+ location_info:
+ required: false
+ type: tosca.datatypes.nfv.ext.LocationInfo
+ inject_data_list:
+ entry_schema:
+ type: tosca.datatypes.nfv.ext.InjectData
+ required: false
+ type: list
+ requirements:
+ - guest_os:
+ capability: tosca.capabilities.nfv.ext.GuestOs
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - local_storage:
+ capability: tosca.capabilities.nfv.ext.LocalAttachment
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - volume_storage:
+ capability: tosca.capabilities.Attachment
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - dependency:
+ capability: tosca.capabilities.Node
+ occurrences:
+ - 0
+ - UNBOUNDED
+ tosca.nodes.nfv.ext.zte.VL:
+ capabilities:
+ virtual_linkable:
+ type: tosca.capabilities.nfv.VirtualLinkable
+ derived_from: tosca.nodes.Root
+ properties:
+ segmentation_id:
+ required: false
+ type: string
+ network_name:
+ required: false
+ type: string
+ is_predefined:
+ required: false
+ type: boolean
+ mtu:
+ required: false
+ type: integer
+ dns_nameservers:
+ entry_schema:
+ type: string
+ required: false
+ type: list
+ physical_network:
+ required: false
+ type: string
+ dhcp_enabled:
+ required: false
+ type: boolean
+ network_id:
+ required: false
+ type: string
+ host_routes:
+ entry_schema:
+ type: tosca.datatypes.nfv.ext.HostRouteInfo
+ required: false
+ type: list
+ ip_version:
+ required: false
+ type: integer
+ vendor:
+ required: false
+ type: string
+ name:
+ required: false
+ type: string
+ start_ip:
+ required: false
+ type: string
+ vlan_transparent:
+ required: false
+ type: boolean
+ cidr:
+ required: false
+ type: string
+ gateway_ip:
+ required: false
+ type: string
+ network_type:
+ required: false
+ type: string
+ end_ip:
+ required: false
+ type: string
+ location_info:
+ required: false
+ type: tosca.datatypes.nfv.ext.LocationInfo
+ tosca.nodes.nfv.ext.zte.VNF:
+ capabilities:
+ forwarder:
+ type: tosca.capabilities.nfv.Forwarder
+ derived_from: tosca.nodes.Root
+ properties:
+ request_reclassification:
+ required: false
+ type: boolean
+ domain_type:
+ required: false
+ type: string
+ nsh_aware:
+ required: false
+ type: boolean
+ plugin_info:
+ required: false
+ type: string
+ adjust_vnf_capacity:
+ required: false
+ type: boolean
+ vnfd_version:
+ required: false
+ type: string
+ vmnumber_overquota_alarm:
+ required: false
+ type: boolean
+ custom_properties:
+ entry_schema:
+ type: string
+ required: false
+ type: map
+ version:
+ required: false
+ type: string
+ cross_dc:
+ required: false
+ type: boolean
+ script_info:
+ required: false
+ type: string
+ vendor:
+ required: false
+ type: string
+ is_shared:
+ required: false
+ type: boolean
+ name:
+ required: false
+ type: string
+ vnf_extend_type:
+ required: false
+ type: string
+ id:
+ required: false
+ type: string
+ vnf_type:
+ required: false
+ type: string
+ is_sfc_proxy:
+ required: false
+ type: boolean
+ requirements:
+ - forwarder:
+ capability: tosca.capabilities.nfv.Forwarder
+ occurrences:
+ - 0
+ - UNBOUNDED
+ - virtualLink:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ occurrences:
+ - 0
+ - UNBOUNDED
+
+ tosca.nodes.nfv.VnfVirtualLinkDesc:
+ capabilities:
+ monitoring_parameters:
+ type: tosca.capabilities.nfv.Metric
+ virtual_linkable:
+ type: tosca.capabilities.nfv.VirtualLinkable
+ derived_from: tosca.nodes.Root
+ properties:
+ vl_flavours:
+ entry_schema:
+ type: string
+ type: map
+ description:
+ required: false
+ type: string
+ test_access:
+ entry_schema:
+ type: string
+ required: false
+ type: list
+ connectivity_type:
+ type: tosca.datatypes.nfv.ConnectivityType \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/pom.xml
deleted file mode 100644
index 12fd1179c5..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>att-sdc-translator-impl</name>
- <artifactId>att-sdc-translator-impl</artifactId>
-
-
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-lib</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
-<!-- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency >-->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-translator-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc.core</groupId>
- <artifactId>openecomp-heat-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc.core</groupId>
- <artifactId>openecomp-tosca-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc.common</groupId>
- <artifactId>openecomp-tosca-datatype</artifactId>
- <version>${openecomp.sdc.common.version}</version>
- </dependency>
-
-
- <!-- need to be changed to sdk -->
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-translator-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn.surefire.version}</version>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/tosca/datatypes/AttToscaPolicyType.java b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/tosca/datatypes/AttToscaPolicyType.java
deleted file mode 100644
index fd893730c4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/tosca/datatypes/AttToscaPolicyType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.att.sdc.tosca.datatypes;
-
-import org.openecomp.config.api.Configuration;
-import org.openecomp.config.api.ConfigurationManager;
-import org.openecomp.sdc.tosca.services.ConfigConstants;
-
-/**
- * Created by TALIO on 5/17/2017.
- */
-public class AttToscaPolicyType {
- private static Configuration config = ConfigurationManager.lookup();
-
- public static final String POLICY_TYPE_PREFIX =
- config.getAsString(ConfigConstants.NAMESPACE, ConfigConstants.PREFIX_POLICY_TYPE);
-
-
- public static final String PLACEMENT_VALET_AFFINITY = POLICY_TYPE_PREFIX + "placement.valet" +
- ".Affinity";
- public static final String PLACEMENT_VALET_EXCLUSIVITY =
- POLICY_TYPE_PREFIX + "placement.valet.Exclusivity";
- public static final String PLACEMENT_VALET_DIVERSITY = POLICY_TYPE_PREFIX + "placement.valet" +
- ".Diversity";
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImpl.java b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImpl.java
deleted file mode 100644
index 176c7c5e65..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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 com.att.sdc.translator.services.heattotosca.impl.resourcetranslation;
-
-import com.att.sdc.tosca.datatypes.AttToscaPolicyType;
-import com.google.common.base.Strings;
-import org.apache.commons.collections4.MapUtils;
-import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
-import org.openecomp.sdc.heat.datatypes.model.HeatResourcesTypes;
-import org.openecomp.sdc.heat.datatypes.model.Resource;
-import org.openecomp.sdc.tosca.datatypes.ToscaGroupType;
-import org.openecomp.sdc.tosca.datatypes.ToscaTopologyTemplateElements;
-import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition;
-import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.PolicyDefinition;
-import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo;
-import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
-import org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil;
-import org.openecomp.sdc.translator.services.heattotosca.ResourceTranslationFactory;
-import org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationBase;
-import org.openecomp.sdc.translator.services.heattotosca.mapping.TranslatorHeatToToscaPropertyConverter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-import static org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil.getResource;
-
-public class ResourceTranslationValetGroupAssignmentImpl extends ResourceTranslationBase {
- private static final String AFFINITY = "affinity";
- private static final String EXCLUSIVITY = "exclusivity";
- private static final String DIVERSITY = "diversity";
- private static List<String> supportedPolicies = Arrays.asList(AFFINITY, EXCLUSIVITY, DIVERSITY);
-
- private boolean validateGroupType(TranslateTo translateTo) {
- Map<String, Object> properties = translateTo.getResource().getProperties();
- if (properties == null) {
- return false;
- }
-
- Object groupType = properties.get("group_type");
- if (Objects.isNull(groupType)) {
- return false;
- }
- return isGroupTypeValid(groupType);
- }
-
- @Override
- protected void translate(TranslateTo translateTo) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
- String resourceId = translateTo.getResourceId();
- Optional<String> toscaPolicyType = getToscaPolicies(translateTo.getResource(), resourceId);
- if (toscaPolicyType.isPresent()) {
- List<String> members = getAttValetGroupAssignmentMembers(translateTo);
- addGroupToTopology(translateTo, resourceId, members);
- addPoliciesToTopology(translateTo, toscaPolicyType.get());
- }
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- }
-
- @Override
- protected String generateTranslatedId(TranslateTo translateTo) {
- return isEssentialRequirementsValid(translateTo) ? getValetGroupAssignmentTranslatedGroupId(
- translateTo) : null;
- }
-
- @Override
- protected Optional<ToscaTopologyTemplateElements> getTranslatedToscaTopologyElement(
- TranslateTo translateTo) {
- if (isEssentialRequirementsValid(translateTo)) {
- return Optional.of(ToscaTopologyTemplateElements.GROUP);
- } else {
- return Optional.empty();
- }
- }
-
- @Override
- protected boolean isEssentialRequirementsValid(TranslateTo translateTo) {
- return validateGroupType(translateTo);
- }
-
- private void addPoliciesToTopology(TranslateTo translateTo, String policyType) {
- mdcDataDebugMessage.debugEntryMessage(null, null);
- ResourceTranslationBase.logger.info("******** Creating policy '%s' ********", policyType);
- PolicyDefinition policyDefinition = new PolicyDefinition();
- policyDefinition.setType(policyType);
- policyDefinition
- .setTargets(
- Collections.singletonList(getValetGroupAssignmentTranslatedGroupId(translateTo)));
- policyDefinition.setProperties(TranslatorHeatToToscaPropertyConverter
- .getToscaPropertiesSimpleConversion(translateTo.getServiceTemplate(),
- translateTo.getResourceId(),translateTo.getResource().getProperties(),
- policyDefinition.getProperties(), translateTo.getHeatFileName(),
- translateTo.getHeatOrchestrationTemplate(), translateTo.getResource().getType(),
- policyDefinition, translateTo.getContext()));
-
- DataModelUtil.addPolicyDefinition(translateTo.getServiceTemplate(),
- getTranslatedPolicyId(translateTo), policyDefinition);
- ResourceTranslationBase.logger.info("******** Policy '%s' created ********", policyType);
- mdcDataDebugMessage.debugExitMessage(null, null);
- }
-
- private String getTranslatedPolicyId(TranslateTo translateTo) {
- return translateTo.getResourceId() + "_policy";
- }
-
- private void addGroupToTopology(TranslateTo translateTo, String resourceId,
- List<String> members) {
- mdcDataDebugMessage.debugEntryMessage(null, null);
- ResourceTranslationBase.logger
- .info("******** Start creating group for resource '%s' ********", resourceId);
- GroupDefinition group = new GroupDefinition();
- group.setMembers(members);
- group.setType(ToscaGroupType.NATIVE_ROOT);
- String groupId = getValetGroupAssignmentTranslatedGroupId(translateTo);
- DataModelUtil
- .addGroupDefinitionToTopologyTemplate(translateTo.getServiceTemplate(), groupId, group);
- ResourceTranslationBase.logger
- .info("******** Creating group '%s' for resource '%s' ********", groupId, resourceId);
- mdcDataDebugMessage.debugExitMessage(null, null);
- }
-
- private List<String> getAttValetGroupAssignmentMembers(TranslateTo translateTo) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
- Map<String, Object> properties = translateTo.getResource().getProperties();
- List<String> members = new ArrayList<>();
- String refResourceId;
- Optional<String> refAttachedResourceId;
-
- if (MapUtils.isNotEmpty(properties)) {
- Object resources = properties.get("resources");
-
- //if null warning no resource
- if (resources instanceof List) {
- for (Object member : ((List) resources)) {
- if (member instanceof Map) {
- refResourceId = (String) ((Map) member).get("get_resource");
-
- refAttachedResourceId =
- ResourceTranslationBase.getResourceTranslatedId(translateTo.getHeatFileName(),
- translateTo.getHeatOrchestrationTemplate(), refResourceId,
- translateTo.getContext());
- if (refAttachedResourceId.isPresent() ) {
- members.add(refAttachedResourceId.get());
- updateComputeConsolidationDataGroup(translateTo, refResourceId);
- }
- }
- }
- }
- }
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- return members;
- }
-
- private void updateComputeConsolidationDataGroup(TranslateTo translateTo,
- String refResourceId) {
- Resource refResource =
- getResource(translateTo.getHeatOrchestrationTemplate(), refResourceId,
- translateTo.getHeatFileName());
- if (isNovaServerResource(translateTo.getHeatOrchestrationTemplate(), refResourceId)) {
- String heatFileName = translateTo.getHeatFileName();
- Optional<String> translatedNovaServerId =
- ResourceTranslationFactory.getInstance(refResource)
- .translateResource(heatFileName, translateTo.getServiceTemplate(),
- translateTo.getHeatOrchestrationTemplate(), refResource, refResourceId,
- translateTo.getContext());
- //Add nova server information to compute data
- if (translatedNovaServerId.isPresent()) {
- NodeTemplate translatedNovaServerNodeTemplate = DataModelUtil
- .getNodeTemplate(translateTo.getServiceTemplate(),
- translatedNovaServerId.get());
- if (translatedNovaServerNodeTemplate != null) {
- ComputeTemplateConsolidationData computeTemplateConsolidationData = ConsolidationDataUtil
- .getComputeTemplateConsolidationData(translateTo.getContext(), translateTo
- .getServiceTemplate(), translatedNovaServerNodeTemplate.getType(),
- translatedNovaServerId.get());
- ConsolidationDataUtil.updateGroupIdInConsolidationData(computeTemplateConsolidationData,
- translateTo.getTranslatedId());
- }
- }
- }
- }
-
- private boolean isNovaServerResource(HeatOrchestrationTemplate heatOrchestrationTemplate,
- Object resourceToTranslate) {
- return heatOrchestrationTemplate.getResources().get(resourceToTranslate).getType()
- .equals(HeatResourcesTypes.NOVA_SERVER_RESOURCE_TYPE.getHeatResource());
- }
-
-
- private Optional<String> getToscaPolicies(Resource resource, String resourceId) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
- Map<String, Object> properties = resource.getProperties();
- if (Objects.isNull(properties) || Objects.isNull(properties.get("group_type"))) {
- ResourceTranslationBase.logger
- .warn("Resource '" + resourceId + "'(" + resource.getType() + ") missing group_type");
- return Optional.empty();
- }
-
- Object groupType = properties.get("group_type");
- if (!isGroupTypeValid(groupType)) {
- ResourceTranslationBase.logger.warn("Resource '" + resourceId + "'(" + resource.getType()
- + ") contains unsupported policy '" + groupType
- + "'. This resource is been ignored during the translation");
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- return Optional.empty();
- }
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- return getToscaPolicyByGroupType((String) groupType);
-
- }
-
- private boolean isGroupTypeValid(Object groupType) {
- if (!(groupType instanceof String)) {
- return false;
- }
- return supportedPolicies.contains(groupType);
- }
-
- private Optional<String> getToscaPolicyByGroupType(String groupType) {
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
- String toscaPolicyType;
- switch (groupType) {
- case AFFINITY:
- toscaPolicyType = AttToscaPolicyType.PLACEMENT_VALET_AFFINITY;
- break;
- case EXCLUSIVITY:
- toscaPolicyType = AttToscaPolicyType.PLACEMENT_VALET_EXCLUSIVITY;
- break;
- default:
- toscaPolicyType = AttToscaPolicyType.PLACEMENT_VALET_DIVERSITY;
- }
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- return Optional.of(toscaPolicyType);
- }
-
-
- private String getValetGroupAssignmentTranslatedGroupId(TranslateTo translateTo) {
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
- String resourceId = super.generateTranslatedId(translateTo);
- String groupName = null;
- Map<String, Object> properties = translateTo.getResource().getProperties();
-
- if (properties == null) {
- return resourceId + "_group";
- }
-
- Object groupNameProperty = properties.get("group_name");
- if (groupNameProperty instanceof String) {
- groupName = (String) groupNameProperty;
- }
-
- if (groupName != null && !Strings.isNullOrEmpty(groupName)) {
- groupName = groupName.replace(" ", "_");
- resourceId += "_" + groupName;
-
- }
-
- mdcDataDebugMessage.debugExitMessage(null, null);
- return resourceId + "_group";
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaMapping.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaMapping.json
deleted file mode 100644
index 2b20db7e9f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaMapping.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "resourceMapping": {
- "ATT::Valet::GroupAssignment": {
- "properties": {
- "level": "level"
- },
- "attributes": {
- }
- }
- },
- "_config": {
- "namespace": "heatToToscaMapping",
- "mergeStrategy": "merge"
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaTranslator.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaTranslator.json
deleted file mode 100644
index 33fb21e5e9..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-merge-heatToToscaTranslator.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "resourceTranslationImpl": {
- "ATT::Valet::GroupAssignment": {
- "enable": true,
- "implementationClass": "com.att.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationValetGroupAssignmentImpl"
- }
- },
- "_config": {
- "namespace": "heatToToscaTranslator",
- "mergeStrategy": "merge"
- }
-
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-override-heatToToscaTranslator.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-override-heatToToscaTranslator.json
deleted file mode 100644
index 2c364fe8af..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/main/resources/config-override-heatToToscaTranslator.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "resourceTranslationImpl": {
- "OS::Contrail::NetworkPolicy": {
- "enable": true,
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationContrailNetworkPolicyImpl"
- },
- "OS::Contrail::AttachPolicy": {
- "enable": true,
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationContrailAttachPolicyImpl"
- },
- "OS::ContrailV2::NetworkPolicy": {
- "enable": true,
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationContrailV2NetworkPolicyImpl"
- },
- "OS::Nova::ServerGroup": {
- "enable": true,
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationNovaServerGroupsImpl"
- },
- "OS::Neutron::SecurityGroup": {
- "enable": true,
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation.ResourceTranslationNeutronSecurityGroupImpl"
- }
- },
- "namingConventionExtractImpl": {
- "NovaServerNodeTypeName": {
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.nameextractor.NameExtractorNovaServerImpl"
- },
- "ContrailComputeNodeTypeName": {
- "implementationClass": "org.openecomp.sdc.translator.services.heattotosca.impl.nameextractor.NameExtractorContrailComputeImpl"
- }
- },
- "_config": {
- "namespace": "heatToToscaTranslator",
- "mergeStrategy": "override"
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
deleted file mode 100644
index 0009388ad3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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 com.att.sdc.translator.services.heattotosca.impl.resourcetranslation;
-
-import org.apache.commons.collections4.MapUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.openecomp.core.translator.datatypes.TranslatorOutput;
-import org.openecomp.core.utilities.file.FileUtils;
-import org.openecomp.core.utilities.json.JsonUtil;
-import org.openecomp.core.validation.util.MessageContainerUtil;
-import org.openecomp.sdc.common.errors.CoreException;
-import org.openecomp.sdc.common.errors.ErrorCategory;
-import org.openecomp.sdc.common.errors.ErrorCode;
-import org.openecomp.sdc.common.utils.SdcCommon;
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.heat.datatypes.manifest.FileData;
-import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
-import org.openecomp.sdc.heat.datatypes.manifest.ManifestFile;
-import org.openecomp.sdc.logging.api.Logger;
-import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
-import org.openecomp.sdc.logging.types.LoggerConstants;
-import org.openecomp.sdc.logging.types.LoggerErrorCode;
-import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
-import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
-import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
-import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl;
-import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
-import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
-import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
-import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.FileComputeConsolidationData;
-import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.TypeComputeConsolidationData;
-import org.openecomp.sdc.translator.services.heattotosca.TranslationService;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import static org.junit.Assert.assertEquals;
-
-
-public class BaseResourceTranslationTest {
-
- protected String inputFilesPath;
- protected String outputFilesPath;
- protected TranslationContext translationContext;
-
- private String zipFilename = "VSP.zip";
- private TranslationService translationService;
- private boolean isValid;
- private File translatedZipFile;
-
- private Map<String, byte[]> expectedResultMap = new HashMap<>();
- private Set<String> expectedResultFileNameSet = new HashSet<>();
-
- private final String MANIFEST_NAME = SdcCommon.MANIFEST_NAME;
- private String validationFilename = "validationOutput.json";
-
- //private final Logger log = (Logger) LoggerFactory.getLogger(this.getClass().getName());
-
- @Before
- public void setUp() throws IOException {
- initTranslatorAndTranslate();
- }
-
- protected void initTranslatorAndTranslate() throws IOException {
- translationService = new TranslationService();
- translationContext = new TranslationContext();
- translatedZipFile = translateZipFile();
- }
-
- protected void testTranslation() throws IOException {
-
- URL url = BaseResourceTranslationTest.class.getResource(outputFilesPath);
-
- String path = url.getPath();
- File pathFile = new File(path);
- File[] files = pathFile.listFiles();
- Assert.assertNotNull("manifest files is empty", files);
- for (File expectedFile : files) {
- expectedResultFileNameSet.add(expectedFile.getName());
- try (FileInputStream input = new FileInputStream(expectedFile)) {
- expectedResultMap.put(expectedFile.getName(), FileUtils.toByteArray(input));
- }
- }
-
- try (FileInputStream fis = new FileInputStream(translatedZipFile);
- ZipInputStream zis = new ZipInputStream(new BufferedInputStream(fis))) {
- ZipEntry entry;
- String name;
- String expected;
- String actual;
-
- while ((entry = zis.getNextEntry()) != null) {
-
- name = entry.getName()
- .substring(entry.getName().lastIndexOf(File.separator) + 1, entry.getName().length());
- if (expectedResultFileNameSet.contains(name)) {
- expected = new String(expectedResultMap.get(name)).trim().replace("\r", "");
- actual = new String(FileUtils.toByteArray(zis)).trim().replace("\r", "");
- assertEquals("difference in file: " + name, expected, actual);
-
- expectedResultFileNameSet.remove(name);
- }
- }
- if (expectedResultFileNameSet.isEmpty()) {
- expectedResultFileNameSet.forEach(System.out::println);
- }
- }
- assertEquals(0, expectedResultFileNameSet.size());
- }
-
- private File translateZipFile() throws IOException {
- URL inputFilesUrl = this.getClass().getResource(inputFilesPath);
- String path = inputFilesUrl.getPath();
- addFilesToTranslator(translationContext, path);
- TranslatorOutput translatorOutput = translationService.translateHeatFiles(translationContext);
- Assert.assertNotNull(translatorOutput);
- if (MapUtils.isNotEmpty(translatorOutput.getErrorMessages()) && MapUtils.isNotEmpty(
- MessageContainerUtil
- .getMessageByLevel(ErrorLevel.ERROR, translatorOutput.getErrorMessages()))) {
- MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB,
- LoggerTragetServiceName.VALIDATE_HEAT_BEFORE_TRANSLATE, ErrorLevel.ERROR.name(),
- LoggerErrorCode.DATA_ERROR.getErrorCode(), "Can't translate HEAT file");
- throw new CoreException((new ErrorCode.ErrorCodeBuilder()).withMessage(
- "Error in validation " + getErrorAsString(translatorOutput.getErrorMessages()))
- .withId("Validation Error").withCategory(ErrorCategory.APPLICATION).build());
- }
- File file = new File(path + "/" + zipFilename);
- file.createNewFile();
-
- try (FileOutputStream fos = new FileOutputStream(file)) {
- ToscaFileOutputService toscaFileOutputService = new ToscaFileOutputServiceCsarImpl();
- fos.write(
- toscaFileOutputService.createOutputFile(translatorOutput.getToscaServiceModel(), null));
- }
-
- return file;
- }
-
- private String getErrorAsString(Map<String, List<ErrorMessage>> errorMessages) {
- StringBuilder sb = new StringBuilder();
- errorMessages.entrySet().forEach(
- entry -> sb.append("File:").append(entry.getKey()).append(System.lineSeparator())
- .append(getErrorList(entry.getValue())));
-
- return sb.toString();
- }
-
- private String getErrorList(List<ErrorMessage> errors) {
- StringBuilder sb = new StringBuilder();
- errors.forEach(
- error -> sb.append(error.getMessage()).append("[").append(error.getLevel()).append("]")
- .append(System.lineSeparator()));
- return sb.toString();
- }
-
- public void addFilesToTranslator(TranslationContext translationContext, String path)
- throws IOException {
- File manifestFile = new File(path);
- File[] files = manifestFile.listFiles();
- byte[] fileContent;
-
- Assert.assertNotNull("manifest files is empty", files);
-
- for (File file : files) {
-
- try (FileInputStream fis = new FileInputStream(file)) {
-
- fileContent = FileUtils.toByteArray(fis);
-
- if (file.getName().equals(MANIFEST_NAME)) {
- addManifest(translationContext, MANIFEST_NAME, fileContent);
- } else {
- if (!file.getName().equals(zipFilename) && (!file.getName().equals(validationFilename))) {
- addFile(translationContext, file.getName(), fileContent);
- }
- }
- }
- }
- }
-
- public static void addManifest(TranslationContext translationContext,
- String name, byte[] content) {
- ManifestContent manifestData = JsonUtil.json2Object(new String(content), ManifestContent.class);
- ManifestFile manifest = new ManifestFile();
- manifest.setName(name);
- manifest.setContent(manifestData);
- translationContext.setManifest(manifest);
- translationContext.addFile(name, content);
- addFilesFromManifestToTranslationContextManifestFilesMap(translationContext, manifestData
- .getData());
- }
-
- public static void addFile(TranslationContext translationContext,
- String name, byte[] content) {
- translationContext.addFile(name, content);
- }
-
-
- public void validateComputeTemplateConsolidationData() {
- ConsolidationData consolidationData = translationContext.getConsolidationData();
- Map<String, ServiceTemplate> expectedServiceTemplateModels = getServiceTemplates
- (outputFilesPath);
- Assert.assertNotNull(consolidationData);
- Assert.assertNotNull(consolidationData.getComputeConsolidationData());
- Set<String> serviceTemplateFileNames = consolidationData.getComputeConsolidationData()
- .getAllServiceTemplateFileNames();
- Assert.assertNotNull(serviceTemplateFileNames);
- for(String serviceTemplateName : serviceTemplateFileNames){
- Assert.assertTrue(expectedServiceTemplateModels.containsKey(serviceTemplateName));
- ServiceTemplate expectedServiceTemplate = expectedServiceTemplateModels.get
- (serviceTemplateName);
- FileComputeConsolidationData fileComputeConsolidationData = consolidationData
- .getComputeConsolidationData().getFileComputeConsolidationData(serviceTemplateName);
- Assert.assertNotNull(fileComputeConsolidationData);
- Set<String> computeTypes = fileComputeConsolidationData.getAllComputeTypes();
- Assert.assertNotNull(computeTypes);
- for(String computeType : computeTypes) {
- TypeComputeConsolidationData typeComputeConsolidationData = fileComputeConsolidationData
- .getTypeComputeConsolidationData(computeType);
- Assert.assertNotNull(typeComputeConsolidationData);
-
- Set<String> computeNodeTemplateIds = typeComputeConsolidationData
- .getAllComputeNodeTemplateIds();
- Assert.assertNotNull(computeNodeTemplateIds);
- Assert.assertNotEquals(computeNodeTemplateIds.size(), 0);
-
- for(String computeNodeTemplateId : computeNodeTemplateIds) {
- ComputeTemplateConsolidationData computeTemplateConsolidationData =
- typeComputeConsolidationData.getComputeTemplateConsolidationData
- (computeNodeTemplateId);
- validateGroupsInConsolidationData(computeNodeTemplateId,
- computeTemplateConsolidationData, expectedServiceTemplate);
- }
- }
- }
- }
-
- public Map<String, ServiceTemplate> getServiceTemplates(String baseDirPath){
- Map<String, ServiceTemplate> serviceTemplateMap = new HashMap<>();
- ToscaExtensionYamlUtil toscaExtensionYamlUtil = new ToscaExtensionYamlUtil();
- baseDirPath = "."+baseDirPath+"/";
- try {
- String[] fileList = {};
- URL filesDirUrl = BaseResourceTranslationTest.class.getClassLoader().getResource(baseDirPath);
- if (filesDirUrl != null && filesDirUrl.getProtocol().equals("file")) {
- fileList = new File(filesDirUrl.toURI()).list();
- } else {
- Assert.fail("Invalid expected output files directory");
- }
-
- for (int i = 0; i < fileList.length; i++) {
- URL resource = BaseResourceTranslationTest.class.getClassLoader().getResource(baseDirPath + fileList[i]);
- ServiceTemplate serviceTemplate = FileUtils.readViaInputStream(resource,
- stream -> toscaExtensionYamlUtil.yamlToObject(stream, ServiceTemplate.class));
- serviceTemplateMap.put(fileList[i], serviceTemplate);
- }
-
- } catch (Exception e) {
- //log.debug("",e);
- Assert.fail(e.getMessage());
- }
- return serviceTemplateMap;
- }
- private void validateGroupsInConsolidationData(String computeNodeTemplateId,
- ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
- ServiceTemplate expectedServiceTemplate) {
- Assert.assertNotNull(computeTemplateConsolidationData);
- List<String> groupIds = computeTemplateConsolidationData.getGroupIds();
- if(groupIds != null) {
- for(String groupId : groupIds) {
- isComputeGroupMember(expectedServiceTemplate, computeNodeTemplateId, groupId);
- }
- }
- }
-
- private void isComputeGroupMember(ServiceTemplate expectedServiceTemplate, String
- computeNodeTemplateId, String groupId) {
- GroupDefinition group = expectedServiceTemplate.getTopology_template().getGroups().get(groupId);
- List<String> groupMembers = group.getMembers();
- Assert.assertNotNull(groupMembers);
- Assert.assertTrue(groupMembers.contains(computeNodeTemplateId));
- }
-
-
- private static void addFilesFromManifestToTranslationContextManifestFilesMap(TranslationContext
- translationContext, List<FileData> fileDataListFromManifest) {
- for (FileData fileFromManfiest : fileDataListFromManifest) {
- translationContext.addManifestFile(fileFromManfiest.getFile(), fileFromManfiest.getType());
- }
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImplTest.java
deleted file mode 100644
index 9c9998fbea..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationValetGroupAssignmentImplTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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 com.att.sdc.translator.services.heattotosca.impl.resourcetranslation;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-//import org.apache.log4j.Logger;
-
-public class ResourceTranslationValetGroupAssignmentImplTest
- extends BaseResourceTranslationTest {
-
- @Override
- @Before
- public void setUp() throws IOException {
- // do not delete this function. it prevents the superclass setup from running
- }
-
- @Test
- public void testTranslateSimpleOnlyNova() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testTranslateGroupNameParameter() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testTranslateComplexNovaAndGroup() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testTranslateComplexOnlyGroup() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/expectedoutputfiles";
-
-/* String[] loggers = { "org.apache.commons.dbcp2"};
- for (String logger : loggers) {
- org.apache.log4j.Logger logSuppress = org.apache.log4j.Logger.getLogger(logger);
- logSuppress.setLevel(org.apache.log4j.Level.OFF);
- }*/
-
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testTranslateComplexTwoGroups() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testInvalidGroupIsNotTranslatedAndNotAddedAsMemberOfGroup() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testSimpleNovaAndNotSupportedResource() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testSimpleOnlyNotSupportedResources() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testSimpleOnlySingleNova() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testConfigNoConnection() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/notconnected/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
- @Test
- public void testDynamicGroup() throws Exception {
- inputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles";
- outputFilesPath =
- "/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/expectedoutputfiles";
- initTranslatorAndTranslate();
- testTranslation();
- validateComputeTemplateConsolidationData();
- }
-
-
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/logback.xml
deleted file mode 100644
index 03ce9d1243..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/logback.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- only one line, shut up logback ! -->
-<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <Pattern>
- %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
- </Pattern>
- </encoder>
- </appender>
- <root level="off">
- <appender-ref ref="STDOUT" />
- </root>
-</configuration> \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 8bc4c3d028..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,304 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer3:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myPort6:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myPort5:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myNovaServer3:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer3
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- SVCgroup2_mixGroup_group:
- type: tosca.groups.Root
- members:
- - SVCgroup1_simpleGroup_group
- - myNovaServer3
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myPort6
- - myPort5
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myNovaServer3
- - myPort1
- - myPort4
- - myPort3
- SVCgroup3_groupsMembers_group:
- type: tosca.groups.Root
- members:
- - SVCgroup1_simpleGroup_group
- - SVCgroup2_mixGroup_group
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- - myNovaServer2
- policies:
- SVCgroup2_policy:
- type: org.openecomp.policies.placement.valet.Diversity
- properties:
- level: host
- targets:
- - SVCgroup2_mixGroup_group
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group
- SVCgroup3_policy:
- type: org.openecomp.policies.placement.valet.Exclusivity
- properties:
- level: rack
- targets:
- - SVCgroup3_groupsMembers_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/main.yml
deleted file mode 100644
index 57e9f04c36..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexNovaAndGroup/inputfiles/main.yml
+++ /dev/null
@@ -1,144 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myNovaServer3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort5 }
- - port: { get_resource: myPort6 }
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- myPort5:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort6:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: diversity
- group_name: mixGroup
- level: host
- resources:
- - { get_resource: SVCgroup1}
- - { get_resource: myNovaServer3}
- SVCgroup3:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: exclusivity
- group_name: groupsMembers
- level: rack
- resources:
- - { get_resource: SVCgroup1}
- - { get_resource: SVCgroup2}
- - { get_resource: SVCgroup4}
- SVCgroup4:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: koko
- group_name: invalid
- level: host
- resources:
- - { get_resource: SVCgroup1}
- - { get_resource: SVCgroup2}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 71b6038eb3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,292 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer3:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myPort6:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myPort5:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myNovaServer3:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer3
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myPort6
- - myPort5
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myNovaServer3
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- - myNovaServer2
- SVCgroup2_complexGroup_group:
- type: tosca.groups.Root
- members:
- - SVCgroup1_simpleGroup_group
- policies:
- SVCgroup2_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup2_complexGroup_group
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/MANIFEST.json
deleted file mode 100644
index 7f1ddfbc90..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/main.yml
deleted file mode 100644
index 2317813e66..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexOnlyGroup/inputfiles/main.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myNovaServer3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort5 }
- - port: { get_resource: myPort6 }
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- myPort5:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort6:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: complexGroup
- level: host
- resources:
- - { get_resource: SVCgroup1} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 072f382fbb..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer3:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myPort6:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myPort5:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myNovaServer3:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer3
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myPort6
- - myPort5
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myNovaServer3
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup1_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- - myNovaServer2
- SVCgroup3_complexTwoGroups_group:
- type: tosca.groups.Root
- members:
- - SVCgroup1_simpleGroup1_group
- - SVCgroup2_group
- SVCgroup2_group:
- type: tosca.groups.Root
- members:
- - myNovaServer3
- policies:
- SVCgroup2_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup2_group
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup1_group
- SVCgroup3_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup3_complexTwoGroups_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/main.yml
deleted file mode 100644
index 14f2659d40..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/complexTwoGroups/inputfiles/main.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myNovaServer3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort5 }
- - port: { get_resource: myPort6 }
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- myPort5:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort6:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: simpleGroup1
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- level: host
- resources:
- - { get_resource: myNovaServer3}
- SVCgroup3:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: complexTwoGroups
- level: host
- resources:
- - { get_resource: SVCgroup1}
- - { get_resource: SVCgroup2} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 9ceb3f0ab7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,202 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- group_name:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/main.yml
deleted file mode 100644
index 0117d4b87c..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/dynamicGroup/inputfiles/main.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
- group_name:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: { get_param: group_name}
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: 2
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup3:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: { get_attr: [myPort4, show ]}
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index ced6638077..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,610 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.vipr_atm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- vf_module_id:
- hidden: false
- immutable: false
- type: string
- description: Unique ID for the VF Module instance
- default: '5678'
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_ha_two_id:
- hidden: false
- immutable: false
- type: string
- description: Neutron UUID of the second high availability network for the vIPR-ATM firewal
- default: b75e27cf-452f-48ef-b107-8777e645c22d
- constraints: [
- ]
- vipr_atm_oam_net_security_groups:
- hidden: false
- immutable: false
- type: list
- description: List of the security group to apply to the vIPR-ATM firewall management port
- default:
- - c2369210-d154-4e4a-984d-047674beb5da
- entry_schema:
- type: string
- vipr_atm_valet_eg_0:
- hidden: false
- immutable: false
- type: string
- description: The Valet 1.0 Exclusivity Group for the vIPR-ATM firewall virtual machine
- default: CORE_INFRASTRUCTURE_VNFs
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_name_0:
- hidden: false
- immutable: false
- type: string
- description: Name of the vIPR-ATM firewall virtual machine
- default: zrcs1cctvpr001
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_image_name:
- hidden: false
- immutable: false
- type: string
- description: Image name of the vIPR-ATM firewall virtual machine
- default: vipr-atm-pan7.1
- constraints: [
- ]
- vnf_name:
- hidden: false
- immutable: false
- type: string
- description: Unique Name for this VF instance
- default: RD3TX100vfw
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_service_left_fqdn:
- hidden: false
- immutable: false
- type: string
- description: FQDN of the Left service network for the vIPR-ATM firewall
- default: default-domain:vIPR-ATM:vIPR-ATM-service-left
- constraints:
- - pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- vipr_atm_ha_one_ip_0:
- hidden: false
- immutable: false
- type: string
- description: Fixed IP to apply to the vIPR-ATM firewall ha0 port
- default: 192.168.35.1
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- vipr_atm_ha_one_id:
- hidden: false
- immutable: false
- type: string
- description: Neutron UUID of the first high availability network for the vIPR-ATM firewall
- default: 4abaafc8-b8af-40b9-b0d0-32bd91f958ee
- constraints: [
- ]
- vnf_id:
- hidden: false
- immutable: false
- type: string
- description: Unique ID for this VF instance
- default: '1234'
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_flavor_name:
- hidden: false
- immutable: false
- type: string
- description: Flavor for the vIPR-ATM firewall virtual machine
- default: m1.vipr-atm-pan
- constraints: [
- ]
- availability_zone_0:
- hidden: false
- immutable: false
- type: string
- description: Availability Zone for the vIPR-ATM firewall virtual machine
- default: nova
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_server_group:
- hidden: false
- immutable: false
- type: string
- description: Server Group with anti-affinity policy for the vIPR-ATM firewall virtual machine
- default: 885dbf7f-fcb2-42d2-a694-a5930ce35b71
- constraints:
- - max_length: 255
- - min_length: 1
- vipr_atm_service_left_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: Left vIPR-ATM service network IP address prefix
- default: 10.254.3.0
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- vipr_atm_ha_one_cidr:
- hidden: false
- immutable: false
- type: string
- description: vIPR-ATM private High Availability Network One IP address CIDR
- default: 192.168.35.0/29
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$
- vipr_atm_service_right_fqdn:
- hidden: false
- immutable: false
- type: string
- description: FQDN of the Right service network for the vIPR-ATM firewall
- default: default-domain:vIPR-ATM:vIPR-ATM-service-right
- constraints:
- - pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- vipr_atm_service_right_ip_prefix_len:
- hidden: false
- immutable: false
- type: float
- description: Right vIPR-ATM service network IP address prefix length
- default: 24
- constraints:
- - in_range:
- - 0
- - 32
- vipr_atm_ha_two_ip_0:
- hidden: false
- immutable: false
- type: string
- description: Fixed IP to apply to the vIPR-ATM firewall ha1 port
- default: 192.168.35.9
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- vipr_atm_ha_two_cidr:
- hidden: false
- immutable: false
- type: string
- description: vIPR-ATM private High Availability Network Two IP address CIDR
- default: 192.168.35.8/29
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$
- oam_net_id:
- hidden: false
- immutable: false
- type: string
- description: Neutron UUID for the managemnet network name of the vIPR-ATM firewall
- default: 1ac9d738-f545-413a-a9a2-b44309edc511
- constraints: [
- ]
- vipr_atm_service_right_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: Right vIPR-ATM service network IP address prefix
- default: 10.254.4.0
- constraints:
- - pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- vipr_atm_service_left_ip_prefix_len:
- hidden: false
- immutable: false
- type: float
- description: Left vIPR-ATM service network IP address prefix length
- default: 24
- constraints:
- - in_range:
- - 0
- - 32
- vipr_atm_contrail_service_instance_fqdn:
- hidden: false
- immutable: false
- type: string
- description: FQDN of the vIPR-ATM firewall Contrail service instance for the port tuple
- default: default-domain:vIPR-ATM:vIPR-ATM-service-instance
- constraints:
- - pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- vipr_atm_ha_two_security_groups:
- hidden: false
- immutable: false
- type: list
- description: List of the security group to apply to the vIPR-ATM firewall ha1 port
- default:
- - 29e29a4a-b45d-42c2-ac14-b12a70036ae6
- entry_schema:
- type: string
- vipr_atm_ha_one_security_groups:
- hidden: false
- immutable: false
- type: list
- description: List of the security group to apply to the vIPR-ATM firewall ha0 port
- default:
- - cbf8049e-69e8-48c3-a06f-255634391403
- entry_schema:
- type: string
- node_templates:
- vIPR_ATM_OAM_SG:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_OAM_SG
- params:
- VNF_NAME:
- get_input: vnf_name
- rules:
- - protocol: tcp
- remote_ip_prefix: 0.0.0.0/0
- port_range_max: 22
- port_range_min: 22
- - protocol: tcp
- remote_ip_prefix: 0.0.0.0/0
- port_range_max: 443
- port_range_min: 443
- - protocol: tcp
- remote_ip_prefix: 0.0.0.0/0
- port_range_max: 3978
- port_range_min: 3978
- - protocol: icmp
- remote_ip_prefix: 0.0.0.0/0
- vIPR_ATM_Left_RVMI:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_3
- params:
- VM_NAME:
- get_input: vipr_atm_name_0
- virtual_network_refs:
- - get_input: vipr_atm_service_left_fqdn
- virtual_machine_interface_properties:
- service_interface_type: left
- port_tuple_refs:
- - UNSUPPORTED_RESOURCE_vIPR_ATM_RPT
- requirements:
- - link:
- capability: tosca.capabilities.network.Linkable
- node: vIPR_ATM_Service_Left
- relationship: tosca.relationships.network.LinksTo
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vIPR_ATM_Firewall
- relationship: tosca.relationships.network.BindsTo
- vIPR_ATM_Service_Right:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_ipam_refs_data:
- - network_ipam_refs_data_ipam_subnets:
- - network_ipam_refs_data_ipam_subnets_subnet:
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
- get_input: vipr_atm_service_right_ip_prefix_len
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
- get_input: vipr_atm_service_right_ip_prefix
- network_name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_RIGHT_NETWORK
- params:
- VNF_NAME:
- get_input: vnf_name
- network_ipam_refs:
- - default-domain:default-project:default-network-ipam
- vIPR_ATM_Ha_Two:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_enabled: false
- network_name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_TWO_NETWORK
- params:
- VNF_NAME:
- get_input: vnf_name
- subnets:
- vIPR_ATM_Ha_Two_Subnet:
- enable_dhcp: false
- name:
- str_replace:
- template: NET_NAME_SUBNET
- params:
- NET_NAME:
- get_attribute:
- - vIPR_ATM_Ha_Two
- - network_name
- cidr:
- get_input: vipr_atm_ha_two_cidr
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: vIPR_ATM_Ha_Two
- relationship: tosca.relationships.DependsOn
- vIPR_ATM_HA_TWO_SG:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_TWO_SG
- params:
- VNF_NAME:
- get_input: vnf_name
- rules:
- - remote_mode: remote_group_id
- vIPR_ATM_HA_ONE_SG:
- type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_ONE_SG
- params:
- VNF_NAME:
- get_input: vnf_name
- rules:
- - remote_mode: remote_group_id
- vIPR_ATM_Ha_One:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- dhcp_enabled: false
- network_name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_ONE_NETWORK
- params:
- VNF_NAME:
- get_input: vnf_name
- subnets:
- vIPR_ATM_Ha_One_Subnet:
- enable_dhcp: false
- name:
- str_replace:
- template: NET_NAME_SUBNET
- params:
- NET_NAME:
- get_attribute:
- - vIPR_ATM_Ha_One
- - network_name
- cidr:
- get_input: vipr_atm_ha_one_cidr
- requirements:
- - dependency:
- capability: tosca.capabilities.Node
- node: vIPR_ATM_Ha_One
- relationship: tosca.relationships.DependsOn
- vIPR_ATM_OAM_0_Port:
- 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
- security_groups:
- get_input: vipr_atm_oam_net_security_groups
- mac_requirements:
- mac_count_required:
- is_required: false
- name:
- str_replace:
- template: VM_NAME_PORT_0
- params:
- VM_NAME:
- get_input: vipr_atm_name_0
- network_role_tag: oam
- network:
- get_input: oam_net_id
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vIPR_ATM_Firewall
- relationship: tosca.relationships.network.BindsTo
- vIPR_ATM_Service_Left:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_ipam_refs_data:
- - network_ipam_refs_data_ipam_subnets:
- - network_ipam_refs_data_ipam_subnets_subnet:
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
- get_input: vipr_atm_service_left_ip_prefix_len
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
- get_input: vipr_atm_service_left_ip_prefix
- network_name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_LEFT_NETWORK
- params:
- VNF_NAME:
- get_input: vnf_name
- network_ipam_refs:
- - default-domain:default-project:default-network-ipam
- vIPR_ATM_Right_RVMI:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_4
- params:
- VM_NAME:
- get_input: vipr_atm_name_0
- virtual_network_refs:
- - get_input: vipr_atm_service_right_fqdn
- virtual_machine_interface_properties:
- service_interface_type: right
- port_tuple_refs:
- - UNSUPPORTED_RESOURCE_vIPR_ATM_RPT
- requirements:
- - link:
- capability: tosca.capabilities.network.Linkable
- node: vIPR_ATM_Service_Right
- relationship: tosca.relationships.network.LinksTo
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vIPR_ATM_Firewall
- relationship: tosca.relationships.network.BindsTo
- vIPR_ATM_Ha_Two_0_Port:
- 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: vipr_atm_ha_two_security_groups
- fixed_ips:
- - ip_address:
- get_input: vipr_atm_ha_two_ip_0
- mac_requirements:
- mac_count_required:
- is_required: false
- name:
- str_replace:
- template: VM_NAME_PORT_2
- params:
- VM_NAME:
- get_input: vipr_atm_name_0
- network:
- get_input: vipr_atm_ha_two_id
- requirements:
- - link:
- capability: tosca.capabilities.network.Linkable
- node: vIPR_ATM_Ha_Two
- relationship: tosca.relationships.network.LinksTo
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vIPR_ATM_Firewall
- relationship: tosca.relationships.network.BindsTo
- vIPR_ATM_Firewall:
- type: org.openecomp.resource.vfc.nodes.heat.vipr_atm
- properties:
- flavor:
- get_input: vipr_atm_flavor_name
- availability_zone:
- get_input: availability_zone_0
- image:
- get_input: vipr_atm_image_name
- metadata:
- vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- contrail_service_instance_ind: true
- name:
- get_input: vipr_atm_name_0
- scheduler_hints:
- group:
- get_input: vipr_atm_server_group
- vIPR_ATM_Ha_One_0_Port:
- 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: vipr_atm_ha_one_security_groups
- fixed_ips:
- - ip_address:
- get_input: vipr_atm_ha_one_ip_0
- mac_requirements:
- mac_count_required:
- is_required: false
- name:
- str_replace:
- template: VM_NAME_PORT_1
- params:
- VM_NAME:
- get_input: vipr_atm_name_0
- network:
- get_input: vipr_atm_ha_one_id
- requirements:
- - link:
- capability: tosca.capabilities.network.Linkable
- node: vIPR_ATM_Ha_One
- relationship: tosca.relationships.network.LinksTo
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vIPR_ATM_Firewall
- relationship: tosca.relationships.network.BindsTo
- groups:
- vIPR_ATM_Server_Group_group:
- type: tosca.groups.Root
- members:
- - vIPR_ATM_Firewall
- vIPR-ATM-Base_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vIPR-ATM-Base.yaml
- description: "HOT template to create the vIPR-ATM firwall service template\
- \ and instance. This template creates the following - Two service virtual\
- \ networks for each side (left and right) of the vIPR-ATM firewalls - Two\
- \ virtual networks for high availability between the vIPR-ATM firewalls\
- \ - A Contrail Service Template for the vIPR-ATM service - A Contrail Service\
- \ Instance for the vIPR-ATM service\nThe firewall virtual machines connected\
- \ to these created networks and managed by the vIPR-ATM service instance\
- \ will be created by the vIPR-ATM-Instance.yaml HOT template.\nNetwork Policy\
- \ that includes the vIPR-ATM service instance will be created by client\
- \ specific HOT templates or Contrail APIs. \n"
- members:
- - vIPR_ATM_Ha_One
- - vIPR_ATM_OAM_SG
- - vIPR_ATM_Service_Left
- - vIPR_ATM_Service_Right
- - vIPR_ATM_Ha_Two
- - vIPR_ATM_HA_TWO_SG
- - vIPR_ATM_HA_ONE_SG
- vIPR_ATM_Valet_EG_0_group:
- type: tosca.groups.Root
- members:
- - vIPR_ATM_Firewall
- vIPR-ATM-Instance_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vIPR-ATM-Instance.yaml
- description: |
- HOT template to create a vIPR-ATM firwall service instance. This template creates the following - Contrail Port Tuple for this firwall service instance - Virtual machine interfaces and IP addresses attached to the two service virtual networks. These virtual machine interfaces will be used by the vIPR firewall service instance - Neutron ports for OAM, HA0, and HA1 networks - OS::Nova::Server with the created virtual machine interface and ports. This is the firewall service instance virtual machine.
- members:
- - vIPR_ATM_Left_RVMI
- - vIPR_ATM_OAM_0_Port
- - vIPR_ATM_Right_RVMI
- - vIPR_ATM_Ha_Two_0_Port
- - vIPR_ATM_Firewall
- - vIPR_ATM_Ha_One_0_Port
- outputs:
- vipr_atm_contrail_service_instance_fqdn:
- description: The FQDN for the Contrail Service Instance that is needed to create tenant OAM network policy to service change through the vIPR-ATM firewall.
- value:
- list_join:
- - ':'
- - get_attr:
- - vIPR_ATM_Service_Instance
- - fq_name
- policies:
- vIPR_ATM_Valet_EG_0_policy:
- type: org.openecomp.policies.placement.valet.Exclusivity
- properties:
- level: host
- targets:
- - vIPR_ATM_Valet_EG_0_group
- vIPR_ATM_Server_Group_policy:
- type: org.openecomp.policies.placement.Antilocate
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVER_GROUP
- params:
- VNF_NAME:
- get_input: vnf_name
- container_type: host
- targets:
- - vIPR_ATM_Server_Group_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/MANIFEST.json
deleted file mode 100644
index 96b8ed1d27..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "name": "vIPR",
- "description": "HOT template to create vIPR",
- "data": [
- {
- "file": "vIPR-ATM-Base.yaml",
- "type": "HEAT",
- "isBase": "true",
- "data": [
- {
- "file": "vIPR-ATM-Base.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "vIPR-ATM-Instance.yaml",
- "type": "HEAT",
- "isBase": "false",
- "data": [
- {
- "file": "vIPR-ATM-Instance.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.env b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.env
deleted file mode 100644
index acf1ac5d03..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.env
+++ /dev/null
@@ -1,14 +0,0 @@
-parameters:
- vipr_atm_service_left_ip_prefix: 10.254.3.0
- vipr_atm_service_left_ip_prefix_len: 24
-
- vipr_atm_service_right_ip_prefix: 10.254.4.0
- vipr_atm_service_right_ip_prefix_len: 24
-
- vipr_atm_ha_one_cidr: 192.168.35.0/29
- vipr_atm_ha_two_cidr: 192.168.35.8/29
-
- vnf_id: '1234'
- vnf_name: 'RD3TX100vfw'
- vf_module_id: '5678'
-
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.yaml
deleted file mode 100644
index fd70465878..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Base.yaml
+++ /dev/null
@@ -1,318 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
- HOT template to create the vIPR-ATM firwall service template and instance.
- This template creates the following
- - Two service virtual networks for each side (left and right) of the vIPR-ATM firewalls
- - Two virtual networks for high availability between the vIPR-ATM firewalls
- - A Contrail Service Template for the vIPR-ATM service
- - A Contrail Service Instance for the vIPR-ATM service
-
- The firewall virtual machines connected to these created networks and managed by the
- vIPR-ATM service instance will be created by the vIPR-ATM-Instance.yaml HOT template.
-
- Network Policy that includes the vIPR-ATM service instance will be created by client
- specific HOT templates or Contrail APIs.
-
-parameters:
- vipr_atm_service_left_ip_prefix:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- description: A valid IPv4 dot quad IP address.
- description: Left vIPR-ATM service network IP address prefix
- vipr_atm_service_left_ip_prefix_len:
- type: number
- constraints:
- - range: { min: 0, max: 32 }
- description: a valid IPv4 prefix value from 0 to 32.
- description: Left vIPR-ATM service network IP address prefix length
-
- vipr_atm_service_right_ip_prefix:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- description: A valid IPv4 dot quad IP address.
- description: Right vIPR-ATM service network IP address prefix
- vipr_atm_service_right_ip_prefix_len:
- type: number
- constraints:
- - range: { min: 0, max: 32 }
- description: a valid IPv4 prefix value from 0 to 32.
- description: Right vIPR-ATM service network IP address prefix length
-
- vipr_atm_ha_one_cidr:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$
- description: A valid IPv4 CIDR (dot quad IP address / previx value 0 to 32).
- description: vIPR-ATM private High Availability Network One IP address CIDR
-
- vipr_atm_ha_two_cidr:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$
- description: A valid IPv4 CIDR (dot quad IP address / previx value 0 to 32).
- description: vIPR-ATM private High Availability Network Two IP address CIDR
-
- vnf_id:
- type: string
- description: Unique ID for this VNF instance
- vnf_name:
- type: string
- description: Unique name for this VNF instance
- vf_module_id:
- type: string
- description: Unique ID for the VF Module instance
-
-resources:
- vIPR_ATM_Service_Left:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_LEFT_NETWORK
- params:
- VNF_NAME: { get_param: vnf_name }
- network_ipam_refs: ["default-domain:default-project:default-network-ipam"]
- network_ipam_refs_data:
- [{
- network_ipam_refs_data_ipam_subnets:
- [{
- network_ipam_refs_data_ipam_subnets_subnet:
- {
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
- {
- get_param: vipr_atm_service_left_ip_prefix
- },
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
- {
- get_param: vipr_atm_service_left_ip_prefix_len
- },
- },
- }]
- }]
-
- vIPR_ATM_Service_Right:
- type: OS::ContrailV2::VirtualNetwork
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_RIGHT_NETWORK
- params:
- VNF_NAME: { get_param: vnf_name }
- network_ipam_refs: ["default-domain:default-project:default-network-ipam"]
- network_ipam_refs_data:
- [{
- network_ipam_refs_data_ipam_subnets:
- [{
- network_ipam_refs_data_ipam_subnets_subnet:
- {
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
- {
- get_param: vipr_atm_service_right_ip_prefix
- },
- network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
- {
- get_param: vipr_atm_service_right_ip_prefix_len
- },
- },
- }]
- }]
-
- vIPR_ATM_Ha_One:
- type: OS::Neutron::Net
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_ONE_NETWORK
- params:
- VNF_NAME: { get_param: vnf_name }
-
- vIPR_ATM_Ha_One_Subnet:
- type: OS::Neutron::Subnet
- depends_on:
- - vIPR_ATM_Ha_One
- properties:
- name:
- str_replace:
- template: NET_NAME_SUBNET
- params:
- NET_NAME: { get_attr: [ vIPR_ATM_Ha_One, name ] }
- network: { get_resource: vIPR_ATM_Ha_One }
- cidr: { get_param: vipr_atm_ha_one_cidr }
- enable_dhcp: False
- gateway_ip: null
-
- vIPR_ATM_Ha_Two:
- type: OS::Neutron::Net
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_TWO_NETWORK
- params:
- VNF_NAME: { get_param: vnf_name }
-
- vIPR_ATM_Ha_Two_Subnet:
- type: OS::Neutron::Subnet
- depends_on:
- - vIPR_ATM_Ha_Two
- properties:
- name:
- str_replace:
- template: NET_NAME_SUBNET
- params:
- NET_NAME: { get_attr: [ vIPR_ATM_Ha_Two, name ] }
- network: { get_resource: vIPR_ATM_Ha_Two }
- cidr: { get_param: vipr_atm_ha_two_cidr }
- enable_dhcp: False
- gateway_ip: null
-
- vIPR_ATM_Service_Template:
- type: OS::ContrailV2::ServiceTemplate
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_TEMPLATE
- params:
- VNF_NAME: { get_param: vnf_name }
- service_template_properties:
- {
- service_template_properties_version: 2,
- service_template_properties_service_mode: transparent,
- service_template_properties_service_type: firewall,
- service_template_properties_service_virtualization_type: virtual-machine,
- service_template_properties_interface_type:
- [
- {
- service_template_properties_interface_type_service_interface_type: Left,
- service_template_properties_interface_type_shared_ip: True,
- },
- {
- service_template_properties_interface_type_service_interface_type: Right,
- service_template_properties_interface_type_shared_ip: True,
- }
- ],
- }
- domain: default-domain
-
- vIPR_ATM_Service_Instance:
- type: OS::ContrailV2::ServiceInstance
- depends_on:
- - vIPR_ATM_Service_Left
- - vIPR_ATM_Service_Right
- - vIPR_ATM_Service_Template
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVICE_INSTANCE
- params:
- VNF_NAME: { get_param: vnf_name }
- service_template_refs: [{ get_resource: vIPR_ATM_Service_Template }]
- service_instance_properties:
- {
- service_instance_properties_ha_mode: active-active,
- service_instance_properties_left_virtual_network:
- {
- list_join: [':', { get_attr: [ vIPR_ATM_Service_Left, fq_name ] } ]
- },
- service_instance_properties_right_virtual_network:
- {
- list_join: [':', { get_attr: [ vIPR_ATM_Service_Right, fq_name ] } ]
- },
- }
-
- # Management (OAM) Port Security Group to allow ingress SSH
- vIPR_ATM_OAM_SG:
- type: OS::Neutron::SecurityGroup
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_OAM_SG
- params:
- VNF_NAME: { get_param: vnf_name }
- rules:
- - remote_ip_prefix: 0.0.0.0/0
- protocol: tcp
- port_range_min: 22
- port_range_max: 22
- - remote_ip_prefix: 0.0.0.0/0
- protocol: tcp
- port_range_min: 443
- port_range_max: 443
- - remote_ip_prefix: 0.0.0.0/0
- protocol: tcp
- port_range_min: 3978
- port_range_max: 3978
- - remote_ip_prefix: 0.0.0.0/0
- protocol: icmp
-
- vIPR_ATM_HA_ONE_SG:
- type: OS::Neutron::SecurityGroup
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_ONE_SG
- params:
- VNF_NAME: { get_param: vnf_name }
- rules:
- - remote_mode: remote_group_id
-
- vIPR_ATM_HA_TWO_SG:
- type: OS::Neutron::SecurityGroup
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_HA_TWO_SG
- params:
- VNF_NAME: { get_param: vnf_name }
- rules:
- - remote_mode: remote_group_id
-
- vIPR_ATM_Server_Group:
- type: OS::Nova::ServerGroup
- properties:
- name:
- str_replace:
- template: VNF_NAME_VIPR_ATM_SERVER_GROUP
- params:
- VNF_NAME: { get_param: vnf_name }
- policies:
- - anti-affinity
-
-outputs:
- vipr_atm_contrail_service_instance_fqdn:
- description: The FQDN for the Contrail Service Instance that is needed to create tenant OAM network policy to service change through the vIPR-ATM firewall.
- value: { list_join: [':', { get_attr: [ vIPR_ATM_Service_Instance, fq_name ] } ] }
-
- vipr_atm_service_left_fqdn:
- description: The FQDN for the vIPR-ATM Service Left network.
- value: { list_join: [':', { get_attr: [ vIPR_ATM_Service_Left, fq_name ] } ] }
-
- vipr_atm_service_right_fqdn:
- description: The FQDN for the vIPR-ATM Service Right network.
- value: { list_join: [':', { get_attr: [ vIPR_ATM_Service_Right, fq_name ] } ] }
-
- vipr_atm_ha_one_id:
- description: The UUID for the vIPR-ATM HA One network.
- value: { get_resource: vIPR_ATM_Ha_One }
-
- vipr_atm_ha_two_id:
- description: The UUID for the vIPR-ATM HA Two network.
- value: { get_resource: vIPR_ATM_Ha_Two }
-
- vipr_atm_oam_net_security_groups:
- description: The list of OpenStack Security Groups to appliy to the vIPR-ATM-Instance\'s OAM network.
- value: [ { get_resource: vIPR_ATM_OAM_SG } ]
-
- vipr_atm_ha_one_security_groups:
- description: The list of OpenStack Security Groups to appliy to the vIPR-ATM-Instance\'s HA One network.
- value: [ { get_resource: vIPR_ATM_HA_ONE_SG } ]
-
- vipr_atm_ha_two_security_groups:
- description: The list of OpenStack Security Groups to appliy to the vIPR-ATM-Instance\'s HA Two network.
- value: [ { get_resource: vIPR_ATM_HA_TWO_SG } ]
-
- vipr_atm_server_group:
- description: The UUID for the vIPR-ATM OpenStack Server Group
- value: { get_resource: vIPR_ATM_Server_Group }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.env b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.env
deleted file mode 100644
index 77e8b8630a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.env
+++ /dev/null
@@ -1,28 +0,0 @@
-parameters:
- oam_net_id: 1ac9d738-f545-413a-a9a2-b44309edc511
- vipr_atm_oam_net_security_groups: [ "c2369210-d154-4e4a-984d-047674beb5da" ]
-
- vipr_atm_contrail_service_instance_fqdn: default-domain:vIPR-ATM:vIPR-ATM-service-instance
-
- vipr_atm_service_left_fqdn: default-domain:vIPR-ATM:vIPR-ATM-service-left
- vipr_atm_service_right_fqdn: default-domain:vIPR-ATM:vIPR-ATM-service-right
-
- vipr_atm_ha_one_id: 4abaafc8-b8af-40b9-b0d0-32bd91f958ee
- vipr_atm_ha_one_ip_0: 192.168.35.1
- vipr_atm_ha_one_security_groups: [ "cbf8049e-69e8-48c3-a06f-255634391403" ]
-
- vipr_atm_ha_two_id: b75e27cf-452f-48ef-b107-8777e645c22d
- vipr_atm_ha_two_ip_0: 192.168.35.9
- vipr_atm_ha_two_security_groups: [ "29e29a4a-b45d-42c2-ac14-b12a70036ae6" ]
-
- vipr_atm_server_group: 885dbf7f-fcb2-42d2-a694-a5930ce35b71
-
- vipr_atm_name_0: zrcs1cctvpr001
- vipr_atm_image_name: vipr-atm-pan7.1
- vipr_atm_flavor_name: m1.vipr-atm-pan
- vipr_atm_valet_eg_0: CORE_INFRASTRUCTURE_VNFs
- availability_zone_0: 'nova'
-
- vnf_id: '1234'
- vnf_name: 'RD3TX100vfw'
- vf_module_id: '5678'
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.yaml
deleted file mode 100644
index ea3b8ab659..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/groupNameParameter/inputfiles/vIPR-ATM-Instance.yaml
+++ /dev/null
@@ -1,299 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
- HOT template to create a vIPR-ATM firwall service instance.
- This template creates the following
- - Contrail Port Tuple for this firwall service instance
- - Virtual machine interfaces and IP addresses attached to the two
- service virtual networks. These virtual machine interfaces will be used
- by the vIPR firewall service instance
- - Neutron ports for OAM, HA0, and HA1 networks
- - OS::Nova::Server with the created virtual machine interface and ports. This
- is the firewall service instance virtual machine.
-
-parameters:
- oam_net_id:
- type: string
- constraints:
- - custom_constraint: neutron.network
- description: This network must currently exist.
- description: Neutron UUID for the managemnet network name of the vIPR-ATM firewall
- vipr_atm_oam_net_security_groups:
- type: comma_delimited_list
- description: List of the security group to apply to the vIPR-ATM firewall management port
-
- vipr_atm_service_left_fqdn:
- type: string
- constraints:
- - allowed_pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- description: |
- A valid Contrail FQDN that contains three parts seperated by ':'.
- The first two part are 1 to 64 characters long and must not contain ':'.
- The third part is 1 to 255 characters long and must not contain ':'.
- description: FQDN of the Left service network for the vIPR-ATM firewall
-
- vipr_atm_service_right_fqdn:
- type: string
- constraints:
- - allowed_pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- description: |
- A valid Contrail FQDN that contains three parts seperated by ':'.
- The first two part are 1 to 64 characters long and must not contain ':'.
- The third part is 1 to 255 characters long and must not contain ':'.
- description: FQDN of the Right service network for the vIPR-ATM firewall
-
- vipr_atm_ha_one_id:
- type: string
- constraints:
- - custom_constraint: neutron.network
- description: This network must currently exist.
- description: Neutron UUID of the first high availability network for the vIPR-ATM firewall
- vipr_atm_ha_one_ip_0:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- description: A valid IPv4 dot quad IP address.
- description: Fixed IP to apply to the vIPR-ATM firewall ha0 port
- vipr_atm_ha_one_security_groups:
- type: comma_delimited_list
- description: List of the security group to apply to the vIPR-ATM firewall ha0 port
-
- vipr_atm_ha_two_id:
- type: string
- constraints:
- - custom_constraint: neutron.network
- description: This network must currently exist.
- description: Neutron UUID of the second high availability network for the vIPR-ATM firewal
- vipr_atm_ha_two_ip_0:
- type: string
- constraints:
- - allowed_pattern: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- description: A valid IPv4 dot quad IP address.
- description: Fixed IP to apply to the vIPR-ATM firewall ha1 port
- vipr_atm_ha_two_security_groups:
- type: comma_delimited_list
- description: List of the security group to apply to the vIPR-ATM firewall ha1 port
-
- vipr_atm_contrail_service_instance_fqdn:
- type: string
- constraints:
- - allowed_pattern: ^(?:[^:]{1,64}:){2}(?:[^:]{1,255})$
- description: |
- A valid Contrail FQDN that contains three parts seperated by ':'.
- The first two part are 1 to 64 characters long and must not contain ':'.
- The third part is 1 to 255 characters long and must not contain ':'.
- description: FQDN of the vIPR-ATM firewall Contrail service instance for the port tuple
-
- vipr_atm_name_0:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Name of the vIPR-ATM firewall virtual machine
- vipr_atm_image_name:
- type: string
- constraints:
- - custom_constraint: glance.image
- description: This image must currently exist.
- description: Image name of the vIPR-ATM firewall virtual machine
- vipr_atm_flavor_name:
- type: string
- constraints:
- - custom_constraint: nova.flavor
- description: This flavor must currently exist.
- description: Flavor for the vIPR-ATM firewall virtual machine
- vipr_atm_server_group:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Server Group with anti-affinity policy for the vIPR-ATM firewall virtual machine
- vipr_atm_valet_eg_0:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: The Valet 1.0 Exclusivity Group for the vIPR-ATM firewall virtual machine
- availability_zone_0:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Availability Zone for the vIPR-ATM firewall virtual machine
-
- vnf_id:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Unique ID for this VF instance
- vnf_name:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Unique Name for this VF instance
- vf_module_id:
- type: string
- constraints:
- - length: { min: 1, max: 255 }
- description: A string with length of at least 1 and less than 255.
- description: Unique ID for the VF Module instance
-
-resources:
- # Create the Port Tuple
- vIPR_ATM_RPT:
- type: OS::ContrailV2::PortTuple
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_TUPLE
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- service_instance: { get_param: vipr_atm_contrail_service_instance_fqdn }
-
- # Left Port (Virtual Machine Interface)
- vIPR_ATM_Left_RVMI:
- type: OS::ContrailV2::VirtualMachineInterface
- depends_on: [ vIPR_ATM_RPT ]
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_3
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- virtual_machine_interface_properties:
- {
- virtual_machine_interface_properties_service_interface_type: 'left'
- }
- port_tuple_refs: [{ get_resource: vIPR_ATM_RPT }]
- virtual_network_refs: [{ get_param: vipr_atm_service_left_fqdn }]
-
- # Right Port (Virtual Machine Interface)
- vIPR_ATM_Right_RVMI:
- type: OS::ContrailV2::VirtualMachineInterface
- depends_on: [ vIPR_ATM_RPT ]
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_4
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- virtual_machine_interface_properties:
- {
- virtual_machine_interface_properties_service_interface_type: 'right'
- }
- port_tuple_refs: [{ get_resource: vIPR_ATM_RPT }]
- virtual_network_refs: [{ get_param: vipr_atm_service_right_fqdn }]
-
- # Left Instance IP
- vIPR_ATM_Left_RII:
- type: OS::ContrailV2::InstanceIp
- depends_on: [ vIPR_ATM_Left_RVMI ]
- properties:
- name:
- str_replace:
- template: VM_NAME_INSTANCE_IP_LEFT
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- virtual_machine_interface_refs: [{ get_resource: vIPR_ATM_Left_RVMI }]
- virtual_network_refs: [{ get_param: vipr_atm_service_left_fqdn }]
-
- # Right Instance IP
- vIPR_ATM_Right_RII:
- type: OS::ContrailV2::InstanceIp
- depends_on: [ vIPR_ATM_Right_RVMI ]
- properties:
- name:
- str_replace:
- template: VM_NAME_INSTANCE_IP_RIGHT
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- virtual_machine_interface_refs: [{ get_resource: vIPR_ATM_Right_RVMI }]
- virtual_network_refs: [{ get_param: vipr_atm_service_right_fqdn }]
-
- # OAM Network Port (not part of Port Tuple)
- vIPR_ATM_OAM_0_Port:
- type: OS::Neutron::Port
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_0
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- network: { get_param: oam_net_id }
- security_groups: { get_param: vipr_atm_oam_net_security_groups }
-
- # HA One Port (not part of Port Tuple)
- vIPR_ATM_Ha_One_0_Port:
- type: OS::Neutron::Port
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_1
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- network: { get_param: vipr_atm_ha_one_id }
- fixed_ips: [ { "ip_address": { get_param: vipr_atm_ha_one_ip_0 } } ]
- security_groups: { get_param: vipr_atm_ha_one_security_groups }
-
- # HA Two Port (not part of Port Tuple)
- vIPR_ATM_Ha_Two_0_Port:
- type: OS::Neutron::Port
- properties:
- name:
- str_replace:
- template: VM_NAME_PORT_2
- params:
- VM_NAME: { get_param: vipr_atm_name_0 }
- network: { get_param: vipr_atm_ha_two_id }
- fixed_ips: [ { "ip_address": { get_param: vipr_atm_ha_two_ip_0 } } ]
- security_groups: { get_param: vipr_atm_ha_two_security_groups }
-
- # Valet Exclusivity Group
- vIPR_ATM_Valet_EG_0:
- type: ATT::Valet::GroupAssignment
- properties:
- group_name: { get_param: vipr_atm_valet_eg_0 }
- group_type: exclusivity
- level: host
- resources:
- - { get_resource: vIPR_ATM_Firewall }
-
- # Create the VM and bind the five ports to it
- # vIPR_ATM_Firewall_Cloud_Config:
- # type: OS::Heat::CloudConfig
- # properties:
- # cloud_config:
- # password: ubuntu
- # chpasswd: { expire: False }
- # ssh_pwauth: True
- # manage_etc_hosts: true
-
- vIPR_ATM_Firewall:
- type: OS::Nova::Server
- depends_on:
- - vIPR_ATM_Left_RII
- - vIPR_ATM_Right_RII
- - vIPR_ATM_OAM_0_Port
- - vIPR_ATM_Ha_One_0_Port
- - vIPR_ATM_Ha_Two_0_Port
- properties:
- name: { get_param: vipr_atm_name_0 }
- image: { get_param: vipr_atm_image_name }
- flavor: { get_param: vipr_atm_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- scheduler_hints:
- group: { get_param: vipr_atm_server_group }
- networks:
- - port: { get_resource: vIPR_ATM_OAM_0_Port }
- - port: { get_resource: vIPR_ATM_Ha_One_0_Port }
- - port: { get_resource: vIPR_ATM_Ha_Two_0_Port }
- - port: { get_resource: vIPR_ATM_Left_RVMI }
- - port: { get_resource: vIPR_ATM_Right_RVMI }
- metadata:
- vnf_id: { get_param: vnf_id }
- vnf_name: { get_param: vnf_name }
- vf_module_id: { get_param: vf_module_id }
-# user_data_format: RAW
-# user_data: { get_resource: vIPR_ATM_Firewall_Cloud_Config }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 5609b76193..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,292 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer3:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myPort6:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myPort5:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer3
- relationship: tosca.relationships.network.BindsTo
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myNovaServer3:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer3
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myPort6
- - myPort5
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myNovaServer3
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup1_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- - myNovaServer2
- SVCgroup3_complexTwoGroups_group:
- type: tosca.groups.Root
- members:
- - SVCgroup1_simpleGroup1_group
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup1_group
- SVCgroup3_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup3_complexTwoGroups_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/main.yml
deleted file mode 100644
index 7dc385e7c8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/invalidGroupAssignment/inputfiles/main.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myNovaServer3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort5 }
- - port: { get_resource: myPort6 }
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- myPort5:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort6:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: simpleGroup1
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
- SVCgroup2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: invalid
- level: host
- resources:
- - { get_resource: myNovaServer3}
- SVCgroup3:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: complexTwoGroups
- level: host
- resources:
- - { get_resource: SVCgroup1}
- - { get_resource: SVCgroup2} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index d0f744c3a5..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members: [
- ]
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Diversity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/main.yml
deleted file mode 100644
index ce061c122a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/notconnected/inputfiles/main.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: diversity
- group_name: simpleGroup
- level: host
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index b16c6c0247..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Exclusivity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/main.yml
deleted file mode 100644
index caa95edfa9..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleNovaAndNotSupportedResource/inputfiles/main.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- myDummyResource:
- type: myDummyResource::type
- properties:
- prop: propertyValue
-
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: exclusivity
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myDummyResource}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index a43a1d1f5d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_emptyGroup_group:
- type: tosca.groups.Root
- members: [
- ]
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_emptyGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/main.yml
deleted file mode 100644
index e5842434e1..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNotSupportedResources/inputfiles/main.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myDummyResource1:
- type: myDummyResource1
- properties:
- prop1: aaaa
-
- myDummyResource2:
- type: myDummyResource2
- properties:
- prop1: bbb
-
-
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: emptyGroup
- level: host
- resources:
- - { get_resource: myDummyResource1}
- - { get_resource: myDummyResource2}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 3ec1bd245e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,210 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- - myNovaServer2
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Affinity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/main.yml
deleted file mode 100644
index 586a7343e4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlyNova/inputfiles/main.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
- - { get_resource: myNovaServer2}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/expectedoutputfiles/MainServiceTemplate.yaml
deleted file mode 100644
index 56b552b348..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/expectedoutputfiles/MainServiceTemplate.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.myNovaServer2:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.myNovaServer1:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- flavor:
- hidden: false
- immutable: false
- type: string
- p1:
- hidden: false
- immutable: false
- type: string
- description: p1
- image:
- hidden: false
- immutable: false
- type: string
- p2:
- hidden: false
- immutable: false
- type: string
- description: p2
- names:
- hidden: false
- immutable: false
- type: string
- myIPs:
- hidden: false
- immutable: false
- type: string
- description: ip1
- availability_zone_1:
- hidden: false
- immutable: false
- type: string
- description: myAvailability_zone_1
- net:
- hidden: false
- immutable: false
- type: string
- description: UID of network
- node_templates:
- myNovaServer1:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer1
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myNovaServer2:
- type: org.openecomp.resource.vfc.nodes.heat.myNovaServer2
- properties:
- flavor:
- get_input: flavor
- availability_zone:
- get_input: availability_zone_1
- image:
- get_input: image
- name:
- get_input:
- - names
- - 0
- myPort2:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort1:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer1
- relationship: tosca.relationships.network.BindsTo
- myPort4:
- 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: p2
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- myPort3:
- 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: p1
- fixed_ips:
- - ip_address:
- get_input:
- - myIPs
- - 0
- mac_requirements:
- mac_count_required:
- is_required: false
- network:
- get_input: net
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: myNovaServer2
- relationship: tosca.relationships.network.BindsTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: cmaui server template for vMMSC
- members:
- - myNovaServer1
- - myNovaServer2
- - myPort2
- - myPort1
- - myPort4
- - myPort3
- SVCgroup1_simpleGroup_group:
- type: tosca.groups.Root
- members:
- - myNovaServer1
- policies:
- SVCgroup1_policy:
- type: org.openecomp.policies.placement.valet.Diversity
- properties:
- level: host
- targets:
- - SVCgroup1_simpleGroup_group \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/MANIFEST.json
deleted file mode 100644
index 539e26b7ab..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/MANIFEST.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vMME_Small",
- "description": "HOT template to create 2 cinder volume attachment",
- "version": "2013-05-23",
- "data": [
- {
- "file": "main.yml",
- "type": "HEAT",
- "isBase": "true"
- }
- ]
-}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/main.yml
deleted file mode 100644
index f7079ce7ce..0000000000
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/resources/mock/services/heattotosca/attValetGroupAssignment/simpleOnlySingleNova/inputfiles/main.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: cmaui server template for vMMSC
-
-parameters:
- net:
- type: string
- description: UID of network
- p1:
- type: string
- description: p1
- p2:
- type: string
- description: p2
- myIPs:
- type: string
- description: ip1
- availability_zone_1:
- type: string
- description: myAvailability_zone_1
- names:
- type: string
- image:
- type: string
- flavor:
- type: string
-resources:
-
- myNovaServer1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort1 }
- - port: { get_resource: myPort2 }
-
-
- myNovaServer2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [names, 0]}
- image: { get_param: image }
- availability_zone: { get_param: availability_zone_1 }
- flavor: { get_param: flavor }
- networks:
- - port: { get_resource: myPort3 }
- - port: { get_resource: myPort4 }
-
- myPort1:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
-
- myPort3:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p1}]
- replacement_policy: AUTO
-
- myPort4:
- type: OS::Neutron::Port
- properties:
- network: { get_param: net }
- fixed_ips: [{"ip_address": {get_param: [myIPs, 0]}}]
- security_groups: [{get_param: p2}]
- replacement_policy: AUTO
- SVCgroup1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: diversity
- group_name: simpleGroup
- level: host
- resources:
- - { get_resource: myNovaServer1}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml
index b5ffede881..bf7f5aa957 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/pom.xml
@@ -19,7 +19,6 @@
<module>openecomp-sdc-translator-sdk</module>
<module>openecomp-sdc-translator-core</module>
<module>openecomp-sdc-translator-impl</module>
- <module>att-sdc-translator-impl</module>
</modules>
<dependencies>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/pom.xml
deleted file mode 100644
index 8208d8bfca..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>att-sdc-validation-impl</name>
- <artifactId>att-sdc-validation-impl</artifactId>
-
-
- <parent>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-lib</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.openecomp.sdc.core</groupId>
- <artifactId>openecomp-facade-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-datatypes-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-logging-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-logging-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-validation-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-validation-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-validation-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc.core</groupId>
- <artifactId>openecomp-heat-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>openecomp-sdc-validation-sdk</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${mvn.surefire.version}</version>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttHeatResourceTypes.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttHeatResourceTypes.java
deleted file mode 100644
index 427fc9c84a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttHeatResourceTypes.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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 com.att.sdc.validation.datatypes;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum AttHeatResourceTypes {
- ATT_VALET_GROUP_ASSIGNMENT("ATT::Valet::GroupAssignment");
-
- private static Map<String, AttHeatResourceTypes> stringToAttRsourceMap;
-
- static {
- stringToAttRsourceMap = new HashMap<>();
-
- for (AttHeatResourceTypes attHeatResourceType : AttHeatResourceTypes.values()) {
- stringToAttRsourceMap.put(attHeatResourceType.type, attHeatResourceType);
- }
- }
-
- private String type;
-
-
- AttHeatResourceTypes(String type) {
- this.type = type;
- }
-
- public String getType() {
- return type;
- }
-
- public static AttHeatResourceTypes findByResourceType(String type) {
- return stringToAttRsourceMap.get(type);
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerErrorDescription.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerErrorDescription.java
deleted file mode 100644
index c4f1d0a4b4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerErrorDescription.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.att.sdc.validation.datatypes;
-
-/**
- * Created by TALIO on 5/21/2017.
- */
-public class AttLoggerErrorDescription {
-
- public static final String ATT_VALET_IN_USE = "ATT Valet group type is in use";
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerTargetServiceName.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerTargetServiceName.java
deleted file mode 100644
index 111a9873fc..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttLoggerTargetServiceName.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.att.sdc.validation.datatypes;
-
-/**
- * Created by TALIO on 5/21/2017.
- */
-public class AttLoggerTargetServiceName {
-
- public static final String VALIDATE_ATT_VALET_TYPE = "Validate OPENECOMP Valet Group Resosurce Type";
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttValetGroupTypeValues.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttValetGroupTypeValues.java
deleted file mode 100644
index 08647b18af..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/datatypes/AttValetGroupTypeValues.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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 com.att.sdc.validation.datatypes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public enum AttValetGroupTypeValues {
- EXCLUSIVITY("exclusivity"),
- AFFINITY("affinity"),
- DIVERSITY("diversity");
-
- private static List<String> groupTypeAsStrings;
-
- static {
- groupTypeAsStrings = new ArrayList<>();
- for (AttValetGroupTypeValues attGroupTypeValue : AttValetGroupTypeValues.values()) {
- groupTypeAsStrings.add(attGroupTypeValue.groupTypeValue);
- }
- }
-
- private String groupTypeValue;
-
- AttValetGroupTypeValues(String groupTypeValue) {
- this.groupTypeValue = groupTypeValue;
- }
-
- public static boolean isGroupTypeValid(Object groupType) {
- if (groupType instanceof Map) {
- return true;
- }
- return groupTypeAsStrings.contains(groupType);
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidator.java
deleted file mode 100644
index 30b65f4b3e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.att.sdc.validation.impl.validators;
-
-import com.att.sdc.validation.datatypes.AttLoggerErrorDescription;
-import com.att.sdc.validation.datatypes.AttLoggerTargetServiceName;
-import com.att.sdc.validation.datatypes.AttValetGroupTypeValues;
-import com.att.sdc.validation.messages.Messages;
-import org.apache.commons.collections4.MapUtils;
-import org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder;
-import org.openecomp.core.validation.types.GlobalValidationContext;
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.heat.datatypes.model.Resource;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
-import org.openecomp.sdc.validation.ResourceValidator;
-import org.openecomp.sdc.validation.ValidationContext;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Created by TALIO on 2/26/2017.
- */
-public class AttValetGroupAssignmentResourceValidator implements ResourceValidator {
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
- @Override
- public void validate(String fileName, Map.Entry<String, Resource> resourceEntry,
- GlobalValidationContext globalContext, ValidationContext validationContext) {
- mdcDataDebugMessage.debugEntryMessage("file", fileName);
-
- Resource resource = resourceEntry.getValue();
-
- Map<String, Object> propertiesMap = resource.getProperties();
- if (MapUtils.isEmpty(propertiesMap)) {
- return;
- }
-
- Object groupTypeValue = propertiesMap.get("group_type");
- if (Objects.isNull(groupTypeValue)) {
- return;
- }
-
- validateGroupTypeValue(fileName, resourceEntry.getKey(), groupTypeValue, globalContext);
- mdcDataDebugMessage.debugExitMessage("file", fileName);
- }
-
- private static void validateGroupTypeValue(String fileName, String resourceId,
- Object groupTypeValue,
- GlobalValidationContext globalContext) {
- mdcDataDebugMessage.debugEntryMessage("file", fileName);
-
- if (!AttValetGroupTypeValues.isGroupTypeValid(groupTypeValue)) {
- globalContext.addMessage(fileName, ErrorLevel.WARNING, ErrorMessagesFormatBuilder
- .getErrorWithParameters(Messages.UNEXPECTED_GROUP_TYPE_ATT_VALET.getErrorMessage(),
- resourceId), AttLoggerTargetServiceName.VALIDATE_ATT_VALET_TYPE,
- AttLoggerErrorDescription.ATT_VALET_IN_USE);
- }
-
- mdcDataDebugMessage.debugExitMessage("file", fileName);
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/messages/Messages.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/messages/Messages.java
deleted file mode 100644
index 0b3274edf0..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/java/com/att/sdc/validation/messages/Messages.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.att.sdc.validation.messages;
-
-/**
- * Created by TALIO on 5/17/2017.
- */
-public enum Messages {
-
- UNEXPECTED_GROUP_TYPE_ATT_VALET(
- "Unexpected group_type for ATT::Valet::GroupAssignment, Resource ID [%s]");
-
- private String errorMessage;
-
- Messages(String errorMessage) {
- this.errorMessage = errorMessage;
- }
-
- public String getErrorMessage() {
- return errorMessage;
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/resources/config-merge-validaton.json b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/resources/config-merge-validaton.json
deleted file mode 100644
index 179f13c344..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/main/resources/config-merge-validaton.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "validatorImplementations": {
- "resourceHeatValidator": {
- "properties": {
- "resourceBaseValidator": {
- "ATT::Valet::GroupAssignment": {
- "enable": true,
- "implementationClass": "com.att.sdc.validation.impl.validators.AttValetGroupAssignmentResourceValidator"
- }
- }
- }
- }
- },
- "_config": {
- "namespace": "validation",
- "mergeStrategy": "merge"
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidatorTest.java
deleted file mode 100644
index acb54f4140..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/java/com/att/sdc/validation/impl/validators/AttValetGroupAssignmentResourceValidatorTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.att.sdc.validation.impl.validators;
-
-import com.att.sdc.validation.datatypes.AttHeatResourceTypes;
-import org.openecomp.core.validation.api.ValidationManager;
-import org.openecomp.core.validation.factory.ValidationManagerFactory;
-import org.openecomp.core.validation.types.GlobalValidationContext;
-import org.openecomp.core.validation.types.MessageContainer;
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.validation.impl.validators.HeatResourceValidator;
-import org.openecomp.sdc.validation.util.ValidationTestUtil;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-
-public class AttValetGroupAssignmentResourceValidatorTest {
-
- HeatResourceValidator baseValidator = new HeatResourceValidator();
- AttValetGroupAssignmentResourceValidator resourceValidator = new
- AttValetGroupAssignmentResourceValidator();
-
- @Test
- public void testATTValetGroupType() {
- Map<String, MessageContainer> messages = ValidationTestUtil.testValidator(baseValidator,
- resourceValidator, AttHeatResourceTypes.ATT_VALET_GROUP_ASSIGNMENT.getType(),
- "/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive");
- Assert.assertNotNull(messages);
- Assert.assertEquals(messages.size(), 0);
-
- messages = ValidationTestUtil.testValidator(baseValidator,
- resourceValidator, AttHeatResourceTypes.ATT_VALET_GROUP_ASSIGNMENT.getType(),
- "/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative");
- Assert.assertNotNull(messages);
- Assert.assertEquals(messages.size(), 1);
- Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().size(), 2);
- Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(0).getMessage(),
- "WARNING: Unexpected group_type for ATT::Valet::GroupAssignment, Resource ID [valet_group_assignment_illegal_1]");
- Assert.assertEquals(messages.get("first.yaml").getErrorMessageList().get(1).getMessage(),
- "WARNING: Unexpected group_type for ATT::Valet::GroupAssignment, Resource ID [valet_group_assignment_illegal_2]");
- }
-
- @Test
- public void testValidationWithFullFlowFromValidationFactory() throws IOException {
- GlobalValidationContext globalContext = ValidationTestUtil.createGlobalContextFromPath(
- "/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative");
- ValidationManager validationManager = ValidationManagerFactory.getInstance().createInterface();
- validationManager.updateGlobalContext(globalContext);
- Map<String, List<ErrorMessage>> messages = validationManager.validate();
-
- Assert.assertNotNull(messages);
- ErrorMessage excpectedMessage = new ErrorMessage(ErrorLevel.WARNING,
- "WARNING: Unexpected group_type for ATT::Valet::GroupAssignment, Resource ID [valet_group_assignment_illegal_1]");
- Assert.assertTrue(messages.get("first.yaml").contains(excpectedMessage));
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.yaml
deleted file mode 100644
index 99e707e91d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/first.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- valet_group_assignment_illegal_1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: blabla
-
- valet_group_assignment_illegal_2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: blabla
-
- valet_group_assignment_legal:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: diversity
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.yaml
deleted file mode 100644
index 14f8e7e550..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/first.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- valet_group_assigment_legal_1:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: affinity
-
- valet_group_assigment_legal_2:
- type: ATT::Valet::GroupAssignment
- properties:
- group_type: diversity
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/att-sdc-validation-impl/src/test/resources/com/att/sdc/validation/impl/validators/att_heat_validator/att_valet_group_type/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml
index 572055b13a..717afb6c33 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/pom.xml
@@ -19,7 +19,6 @@
<module>openecomp-sdc-validation-core</module>
<module>openecomp-sdc-validation-impl</module>
<module>openecomp-sdc-validation-sdk</module>
- <module>att-sdc-validation-impl</module>
</modules>
</project>
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
index 4c38bd94a7..640777e993 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
@@ -340,7 +340,8 @@ public class CandidateServiceImpl implements CandidateService {
Optional<String> jsonFileDataStructure =
orchestrationTemplateCandidateDataDao.getStructure(vspId, version);
- if (jsonFileDataStructure.isPresent()) {
+ if (jsonFileDataStructure.isPresent()
+ && JsonUtil.isValidJson(jsonFileDataStructure.get())) {
mdcDataDebugMessage.debugExitMessage("VSP Id", vspId);
return Optional
.of(JsonUtil.json2Object(jsonFileDataStructure.get(), FilesDataStructure.class));
diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml
index e09fe8cbed..442b7dec15 100644
--- a/openecomp-be/pom.xml
+++ b/openecomp-be/pom.xml
@@ -148,7 +148,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>${mvn.antrun.version}</version>
<executions>
<execution>
<phase>post-integration-test</phase>