aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraribeiro <anderson.ribeiro@est.tech>2022-01-06 16:25:52 +0000
committerMichael Morris <michael.morris@est.tech>2022-01-07 14:01:22 +0000
commitd272fec62dbf8c64d8fff6edc397bdebf6e5c3aa (patch)
tree36a44be69d755ae5c2b2900b5351958fb26f94ae
parentde228cef5770b37861ac7211343086613b21d527 (diff)
Update property to identify SOL004 packages
Issue-ID: SDC-3837 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I2af0628cddbbddd790ff9874e2f393a2f31f7407
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/be/config/Configuration.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIServiceImpl.java2
2 files changed, 10 insertions, 1 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 cabda08ce7..5d9f74005b 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
@@ -145,6 +145,7 @@ public class Configuration extends BasicConfiguration {
private List<ArtifactConfiguration> artifacts;
private Map<String, Map<String, List<String>>> componentAllowedInstanceTypes;
private ExternalCsarStore externalCsarStore;
+ private CsarFormat csarFormat;
@SuppressWarnings("unchecked")
private <K, V> Map<K, V> safeGetCapsInsensitiveMap(Map<K, V> map) {
@@ -515,4 +516,12 @@ public class Configuration extends BasicConfiguration {
}
}
+ @Getter
+ @Setter
+ @NoArgsConstructor
+ public static class CsarFormat {
+
+ private String defaultFormat;
+ }
+
}
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/etsi/ETSIServiceImpl.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/etsi/ETSIServiceImpl.java
index 1399ea9765..a0ab46e589 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/etsi/ETSIServiceImpl.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/etsi/ETSIServiceImpl.java
@@ -98,7 +98,7 @@ public class ETSIServiceImpl implements ETSIService {
}
private String getDefaultCsarFormat() {
- return CommonConfigurationManager.getInstance().getConfigValue("csarFormat", "default", ONAP_CSAR);
+ return CommonConfigurationManager.getInstance().getConfigValue("csarFormat", "defaultFormat", ONAP_CSAR);
}
@Override