Fix CBA artifact recognition by SDC

[sdc.git] / 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 / ManifestCreatorNamingConventionImpl.java

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/ManifestCreatorNamingConventionImpl.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/ManifestCreatorNamingConventionImpl.java
index e1a47db..cac8462 100644 (file)
--- 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/ManifestCreatorNamingConventionImpl.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/ManifestCreatorNamingConventionImpl.java
@@ -40,6 +40,7 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator {
   private static final String CLOUD_SPECIFIC_FIXED_KEY_WORD = "cloudtech";
   private static final String[][] CLOUD_SPECIFIC_KEY_WORDS = {{"k8s", "azure", "aws"}, /* cloud specific technology */
                                                               {"charts", "day0", "configtemplate"} /*cloud specific sub type*/};
+  private static final String CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD = "CBA";
 
   @Override
   public Optional<ManifestContent> createManifest(
@@ -150,6 +151,10 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator {
       }
   }
 
+  private boolean isControllerBlueprintArchive(String artifact) {
+    return artifact.toUpperCase().contains(CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD);
+  }
+
   private void addArtifactsToManifestFileDataList(
       FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
     Collection<String> forArtifacts = CollectionUtils
@@ -158,8 +163,10 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator {
       for (String artifact : forArtifacts) {
         if (isCloudSpecificArtifact(artifact)) {
             fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact));
+        } else if (isControllerBlueprintArchive(artifact)) {
+          fileDataList.add(createBaseFileData(FileData.Type.CONTROLLER_BLUEPRINT_ARCHIVE, artifact));
         } else {
-            fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
+          fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
         }
       }
     }