From: Kuleshov, Elena <evn@att.com>
Date: Mon, 30 Nov 2020 15:10:39 +0000 (-0500)
Subject: Remove policyName retrieval for Tosca handling.
X-Git-Tag: 1.8.0~78
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e1019bab72e396140417db15727b1e00003534a7;p=so.git

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
---

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"));