From e493d4ff662d6f7bf0c7adbc58c356beb2fe2dce Mon Sep 17 00:00:00 2001 From: Sithara Nambiar Date: Sun, 16 Aug 2020 22:28:48 +0530 Subject: SDC changes for adding helm Issue-ID: REQ-341 Signed-off-by: Sithara Nambiar Change-Id: I4721f6e8e2690dc5f7c10bb7b1b2f53ec5f318c7 --- .../ManifestCreatorNamingConventionImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib') 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 cac846294f..539e98df5a 100644 --- 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 @@ -41,6 +41,7 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator { 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"; + private static final String HELM_KEY_WORD = "HELM"; @Override public Optional createManifest( @@ -155,6 +156,10 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator { return artifact.toUpperCase().contains(CONTROLLER_BLUEPRINT_ARCHIVE_FIXED_KEY_WORD); } + private boolean isHelm(String artifact) { + return artifact.toUpperCase().contains(HELM_KEY_WORD); + } + private void addArtifactsToManifestFileDataList( FilesDataStructure filesDataStructure, List fileDataList) { Collection forArtifacts = CollectionUtils @@ -165,7 +170,10 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator { fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact)); } else if (isControllerBlueprintArchive(artifact)) { fileDataList.add(createBaseFileData(FileData.Type.CONTROLLER_BLUEPRINT_ARCHIVE, artifact)); - } else { + } else if (isHelm(artifact)) { + fileDataList.add(createBaseFileData(FileData.Type.HELM, artifact)); + } + else { fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact)); } } -- cgit 1.2.3-korg