diff options
Diffstat (limited to 'common-app-api/src/main')
-rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java | 36 | ||||
-rw-r--r-- | common-app-api/src/main/java/org/openecomp/sdc/be/csar/storage/ArtifactStorageManager.java | 4 |
2 files changed, 38 insertions, 2 deletions
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java index 6ac82a547d..cabda08ce7 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java @@ -144,6 +144,7 @@ public class Configuration extends BasicConfiguration { private EcompPortalConfig ecompPortal; private List<ArtifactConfiguration> artifacts; private Map<String, Map<String, List<String>>> componentAllowedInstanceTypes; + private ExternalCsarStore externalCsarStore; @SuppressWarnings("unchecked") private <K, V> Map<K, V> safeGetCapsInsensitiveMap(Map<K, V> map) { @@ -165,8 +166,8 @@ public class Configuration extends BasicConfiguration { public Map<String, Set<String>> getExcludedGroupTypesMapping() { return safeGetCapsInsensitiveMap(excludedGroupTypesMapping); } - - public List<Map<String, Map<String, String>>> getDefaultImports(){ + + public List<Map<String, Map<String, String>>> getDefaultImports() { return Collections.unmodifiableList(defaultImports); } @@ -483,4 +484,35 @@ public class Configuration extends BasicConfiguration { private String artifactType; private List<PathsAndNamesDefinition> pathsAndNamesDefinitions; } + + @Getter + @Setter + @NoArgsConstructor + public static class ExternalCsarStore { + + private String storageType; + private Endpoint endpoint; + private Credentials credentials; + private String tempPath; + + @Getter + @Setter + @NoArgsConstructor + public static class Endpoint { + + private String host; + private int port; + private boolean secure; + } + + @Getter + @Setter + @NoArgsConstructor + public static class Credentials { + + private String accessKey; + private String secretKey; + } + } + } diff --git a/common-app-api/src/main/java/org/openecomp/sdc/be/csar/storage/ArtifactStorageManager.java b/common-app-api/src/main/java/org/openecomp/sdc/be/csar/storage/ArtifactStorageManager.java index 0a4f355642..f7d611b717 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/be/csar/storage/ArtifactStorageManager.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/be/csar/storage/ArtifactStorageManager.java @@ -47,6 +47,8 @@ public interface ArtifactStorageManager { */ ArtifactInfo upload(String vspId, String versionId, InputStream fileToUpload); + void put(String vspId, String name, InputStream fileToUpload); + /** * Checks if the Artifact Storage is enabled. * @@ -63,5 +65,7 @@ public interface ArtifactStorageManager { InputStream get(final ArtifactInfo artifactInfo); + InputStream get(final String vspId, final String versionId); + void delete(ArtifactInfo artifactInfo); } |