From e1019bab72e396140417db15727b1e00003534a7 Mon Sep 17 00:00:00 2001 From: "Kuleshov, Elena" Date: Mon, 30 Nov 2020 10:10:39 -0500 Subject: 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) Change-Id: I2ecc32bd18f9e42862765168a394dc19d7e4c875 --- .../installer/heat/ToscaResourceInstaller.java | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'asdc-controller/src/main') 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 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")); -- cgit 1.2.3-korg