diff options
author | Liang <liang.ding@intel.com> | 2019-03-13 01:49:25 +0000 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2019-04-10 06:10:03 +0000 |
commit | ef0e8be1453e3959b38c9832e3e729e4e86a9e04 (patch) | |
tree | 35240c48472a44b48ab959ded27892d870674b9b /openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java | |
parent | fffb841e0ba5a48f5a8606c28e013f23723db3b5 (diff) |
specify a new type to cloud specific artifacts
Change-Id: I26e9533989a377d407290451063d97263a814d6b
Issue-ID: SDC-2041
Signed-off-by: Liang Ding <liang.ding@intel.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java')
1 files changed, 22 insertions, 1 deletions
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 3c100f1ed5..e1a47db9db 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 @@ -36,6 +36,11 @@ import java.util.regex.Pattern; public class ManifestCreatorNamingConventionImpl implements ManifestCreator { protected static final Logger logger = LoggerFactory.getLogger(ManifestCreatorNamingConventionImpl.class); + + 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*/}; + @Override public Optional<ManifestContent> createManifest( VspDetails vspDetails, FilesDataStructure filesDataStructure) { @@ -132,6 +137,18 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator { return Pattern.matches(Constants.BASE_HEAT_REGEX, fileName) && !isVolFile(fileName); } + protected boolean isCloudSpecificArtifact(String artifact) { + if (artifact.contains(CLOUD_SPECIFIC_FIXED_KEY_WORD)) { + for (int i = 0; i < CLOUD_SPECIFIC_KEY_WORDS.length; i++) { + if (Arrays.stream(CLOUD_SPECIFIC_KEY_WORDS[i]).noneMatch(str -> artifact.contains(str))) { + return false; + } + } + return true; + } else { + return false; + } + } private void addArtifactsToManifestFileDataList( FilesDataStructure filesDataStructure, List<FileData> fileDataList) { @@ -139,7 +156,11 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator { .union(filesDataStructure.getArtifacts(), filesDataStructure.getUnassigned()); if (CollectionUtils.isNotEmpty(forArtifacts)) { for (String artifact : forArtifacts) { - fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact)); + if (isCloudSpecificArtifact(artifact)) { + fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact)); + } else { + fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact)); + } } } } |