- Make association from the cvnfc to the fabric

- Make association from the cvnfc to the fabric config.

Issue-ID: SO-2262
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I8d9c1e5b738ec36fb3c6d9bae4acfef155b0e058

1 files changed, 24 insertions, 15 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 08aee1ab4e..8894df044b 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
@@ -2154,6 +2154,7 @@ public class ToscaResourceInstaller {
                         cvnfcCustomization.setNfcNamingCode(getLeafPropertyValue(cvfcEntity, "nfc_naming_code"));
 
                         cvnfcCustomization.setVfModuleCustomization(vfModuleCustomization);
+
                         // *****************************************************************************************************************************************
                         // * Extract Fabric Configuration
                         // *****************************************************************************************************************************************
@@ -2162,31 +2163,39 @@ public class ToscaResourceInstaller {
                                 getEntityDetails(toscaResourceStructure, EntityQuery.newBuilder(SdcTypes.CONFIGURATION),
                                         TopologyTemplateQuery.newBuilder(SdcTypes.VF), false);
 
-
                         for (IEntityDetails fabricEntity : fabricEntityList) {
 
-                            ConfigurationResource fabricConfig = null;
+                            Map<String, RequirementAssignment> requirements = fabricEntity.getRequirements();
+
+                            for (RequirementAssignment requirement : requirements.values()) {
+
+                                if (requirement.getNodeTemplateName().equals(cvfcEntity.getName())) {
+
+                                    ConfigurationResource fabricConfig = null;
 
-                            ConfigurationResource existingConfig =
-                                    findExistingConfiguration(existingCvnfcConfigurationCustom,
+                                    ConfigurationResource existingConfig = findExistingConfiguration(
+                                            existingCvnfcConfigurationCustom,
                                             fabricEntity.getMetadata().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
 
-                            if (existingConfig == null) {
+                                    if (existingConfig == null) {
 
-                                fabricConfig = createFabricConfiguration(fabricEntity, toscaResourceStructure);
+                                        fabricConfig = createFabricConfiguration(fabricEntity, toscaResourceStructure);
 
-                            } else {
-                                fabricConfig = existingConfig;
-                            }
+                                    } else {
+                                        fabricConfig = existingConfig;
+                                    }
+
+                                    CvnfcConfigurationCustomization cvnfcConfigurationCustomization =
+                                            createCvnfcConfigurationCustomization(fabricEntity, toscaResourceStructure,
+                                                    vnfResource, vfModuleCustomization, cvnfcCustomization,
+                                                    fabricConfig, vfModuleMemberName);
 
-                            CvnfcConfigurationCustomization cvnfcConfigurationCustomization =
-                                    createCvnfcConfigurationCustomization(fabricEntity, toscaResourceStructure,
-                                            vnfResource, vfModuleCustomization, cvnfcCustomization, fabricConfig,
-                                            vfModuleMemberName);
+                                    cvnfcConfigurationCustomizations.add(cvnfcConfigurationCustomization);
 
-                            cvnfcConfigurationCustomizations.add(cvnfcConfigurationCustomization);
+                                    existingCvnfcConfigurationCustom.add(cvnfcConfigurationCustomization);
 
-                            existingCvnfcConfigurationCustom.add(cvnfcConfigurationCustomization);
+                                }
+                            }
 
                         }
                         cvnfcCustomization.setCvnfcConfigurationCustomization(cvnfcConfigurationCustomizations);