This patch fixes CBA artifact recogntion as 'OTHER'
instead of 'CONTROLLER_BLUEPRINT_ARCHIVE'.
Change-Id: I15d8ef62a57e4a0f627949e267209cba3cbe4c56
Issue-ID: SDC-2776
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
(cherry picked from commit
f264cf6aa20a97b05a92d4dd3aa7ca4ee49db7f1)
VENDOR_LICENSE("VENDOR_LICENSE"),
VF_LICENSE("VF_LICENSE"),
CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"),
VENDOR_LICENSE("VENDOR_LICENSE"),
VF_LICENSE("VF_LICENSE"),
CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"),
+ CONTROLLER_BLUEPRINT_ARCHIVE("CONTROLLER_BLUEPRINT_ARCHIVE"),
OTHER("OTHER"),
PNF_SW_INFORMATION("PNF_SW_INFORMATION");
OTHER("OTHER"),
PNF_SW_INFORMATION("PNF_SW_INFORMATION");
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 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(
@Override
public Optional<ManifestContent> createManifest(
+ 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
private void addArtifactsToManifestFileDataList(
FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
Collection<String> forArtifacts = CollectionUtils
for (String artifact : forArtifacts) {
if (isCloudSpecificArtifact(artifact)) {
fileDataList.add(createBaseFileData(FileData.Type.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, artifact));
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));
- fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));
+ fileDataList.add(createBaseFileData(FileData.Type.OTHER, artifact));