summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuleshov, Elena <evn@att.com>2020-11-30 10:10:39 -0500
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-11-30 10:10:40 -0500
commite1019bab72e396140417db15727b1e00003534a7 (patch)
treeefdd51fbf5336ee26e675272b4dd551b09925ded
parente73969227e1bee08e02a28cc5255a98d58a0121c (diff)
Remove policyName retrieval for Tosca handling.
Remove policyName retrieval for Tosca handling. Add assertion that policy name is not set. Issue-ID: SO-3405 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I2ecc32bd18f9e42862765168a394dc19d7e4c875
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java22
1 files changed, 0 insertions, 22 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index d57b305902..7efc397e30 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -2227,28 +2227,6 @@ public class ToscaResourceInstaller {
.setModelCustomizationUUID(fabricMetadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
cvnfcConfigurationCustomization.setModelInstanceName(fabricEntity.getName());
- List<IEntityDetails> policyList =
- getEntityDetails(toscaResourceStruct, EntityQuery.newBuilder("org.openecomp.policies.External"),
- TopologyTemplateQuery.newBuilder(SdcTypes.VF), true);
-
-
- if (policyList != null) {
- for (IEntityDetails policyEntity : policyList) {
-
- for (String policyCvfcTarget : policyEntity.getTargets()) {
-
- if (policyCvfcTarget.equalsIgnoreCase(vfModuleMemberName)) {
-
- String policyType = getLeafPropertyValue(policyEntity, "type");
-
- if (policyType != null && policyType.equalsIgnoreCase("Fabric Policy")) {
- cvnfcConfigurationCustomization.setPolicyName(getLeafPropertyValue(policyEntity, "name"));
- }
- }
- }
- }
- }
-
cvnfcConfigurationCustomization.setConfigurationFunction(getLeafPropertyValue(fabricEntity, "function"));
cvnfcConfigurationCustomization.setConfigurationRole(getLeafPropertyValue(fabricEntity, "role"));
cvnfcConfigurationCustomization.setConfigurationType(getLeafPropertyValue(fabricEntity, "type"));