Each rApp resources are unique and it's handled using Set.
Issue-ID: NONRTRIC-913
Signed-off-by: aravind.est <aravindhan.a@est.tech>
Change-Id: I1f64280c8bb3b5a41b08a4ab69d1c862b18ca135
import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import java.util.List;
+import java.util.Set;
public class RappResourceBuilder {
public RappResources getResources() {
RappResources rappResources = new RappResources();
- RappResources.ACMResources acmResources = new RappResources.ACMResources("compositions", List.of());
- acmResources.setCompositionInstances(List.of("kserve-instance"));
+ RappResources.ACMResources acmResources = new RappResources.ACMResources("compositions", Set.of());
+ acmResources.setCompositionInstances(Set.of("kserve-instance"));
rappResources.setAcm(acmResources);
return rappResources;
}
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
-import java.util.List;
+import java.util.Set;
import java.util.UUID;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.commons.compress.archivers.ArchiveEntry;
File csarFile = getCsarFile(rapp);
if (csarFile.exists()) {
rappResources.setAcm(RappResources.ACMResources.builder().compositionDefinitions(
- getFileListFromCsar(csarFile, ACM_DEFINITION_LOCATION).get(0)).compositionInstances(
+ getFileListFromCsar(csarFile, ACM_DEFINITION_LOCATION).iterator().next()).compositionInstances(
getFileListFromCsar(csarFile, ACM_INSTANCES_LOCATION)).build());
rappResources.setSme(RappResources.SMEResources.builder().providerFunctions(
getFileListFromCsar(csarFile, SME_PROVIDER_FUNCS_LOCATION))
return rappResources;
}
- List<String> getFileListFromCsar(File csarFile, String dirLocation) {
+ Set<String> getFileListFromCsar(File csarFile, String dirLocation) {
try (ZipFile zipFile = new ZipFile(csarFile)) {
return zipFile.stream().filter(Predicate.not(ZipEntry::isDirectory)).map(ZipEntry::getName)
.filter(name -> name.startsWith(dirLocation))
- .map(name -> name.substring(name.lastIndexOf("/") + 1, name.lastIndexOf("."))).toList();
+ .map(name -> name.substring(name.lastIndexOf("/") + 1, name.lastIndexOf(".")))
+ .collect(Collectors.toSet());
} catch (IOException e) {
logger.warn("Error in listing the files from csar", e);
}
- return List.of();
+ return Set.of();
}
}
package com.oransc.rappmanager.models.rapp;
-import java.util.List;
+import java.util.Set;
import lombok.Builder;
import lombok.Data;
public static class ACMResources {
String compositionDefinitions;
- List<String> compositionInstances;
+ Set<String> compositionInstances;
}
@Data
@Builder
public static class SMEResources {
- List<String> providerFunctions;
- List<String> serviceApis;
- List<String> invokers;
+ Set<String> providerFunctions;
+ Set<String> serviceApis;
+ Set<String> invokers;
}
}
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.util.List;
+import java.util.Set;
import java.util.UUID;
import org.apache.http.entity.ContentType;
import org.json.JSONException;
@Test
void testFileListing() {
File file = new File(validCsarFileLocation + validRappFile);
- List<String> fileListFromCsar =
- rappCsarConfigurationHandler.getFileListFromCsar(file, "Files/Sme/serviceapis/");
+ Set<String> fileListFromCsar = rappCsarConfigurationHandler.getFileListFromCsar(file, "Files/Sme/serviceapis/");
assertThat(fileListFromCsar).hasSize(2);
}
@Test
void testInvalidFileListing() {
File file = new File(validCsarFileLocation);
- List<String> fileListFromCsar = rappCsarConfigurationHandler.getFileListFromCsar(file, null);
+ Set<String> fileListFromCsar = rappCsarConfigurationHandler.getFileListFromCsar(file, null);
assertThat(fileListFromCsar).isEmpty();
}
UUID rappId = UUID.randomUUID();
RappResources rappResources = new RappResources();
rappResources.setAcm(RappResources.ACMResources.builder().compositionDefinitions("compositions")
- .compositionInstances(List.of()).build());
+ .compositionInstances(Set.of()).build());
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.rappResources(rappResources).build();
UUID rappId = UUID.randomUUID();
RappResources rappResources = new RappResources();
rappResources.setAcm(RappResources.ACMResources.builder().compositionDefinitions("invalidcomposition")
- .compositionInstances(List.of()).build());
+ .compositionInstances(Set.of()).build());
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.rappResources(rappResources).build();