Implement truststore & keystore handling for cassandra

[sdc.git] / common-app-api / src / main / java / org / openecomp / sdc / be / config / Configuration.java

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 e30f5f3..d33a80d 100644 (file)
--- 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
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.openecomp.sdc.be.config;
 
 import static java.lang.String.format;
@@ -65,6 +66,9 @@ public class Configuration extends BasicConfiguration {
      * backend protocol. http | https
      */
     private String beProtocol = "http";
+    private String tlsCert;
+    private String tlsKey;
+    private String caCert;
     private Date released;
     private String version = "1111";
     private String toscaConformanceLevel = "3.0";
@@ -99,6 +103,7 @@ public class Configuration extends BasicConfiguration {
     private List<String> licenseTypes;
     private List<String> definedResourceNamespace;
     private List<String> directives;
+    private List<CustomToscaFunction> defaultCustomToscaFunctions;
     private Integer additionalInformationMaxNumberOfKeys;
     private HeatDeploymentArtifactTimeout heatArtifactDeploymentTimeout;
     private BeMonitoringConfig systemMonitoring;
@@ -116,15 +121,12 @@ public class Configuration extends BasicConfiguration {
     private ApplicationL2CacheConfig applicationL2Cache;
     private ToscaValidatorsConfig toscaValidators;
     private boolean disableAudit;
-    private Boolean consumerBusinessLogic;
     private Map<String, VfModuleProperty> vfModuleProperties;
     private Map<String, String> genericAssetNodeTypes;
-    private Map<String, String> serviceNodeTypes;
+    private Map<String, CategoryBaseTypeConfig> serviceBaseNodeTypes;
     private Map<String, Map<String, String>> resourceNodeTypes;
     private String appVersion;
     private String artifactGeneratorConfig;
-    private CadiFilterParams cadiFilterParams;
-    private Boolean aafAuthNeeded = false;
     private String autoHealingOwner;
     private boolean enableAutoHealing;
     private Map<String, List<String>> resourcesForUpgrade;
@@ -136,14 +138,17 @@ public class Configuration extends BasicConfiguration {
     private boolean supportAllottedResourcesAndProxy;
     private Integer deleteLockTimeoutInSeconds;
     private Integer maxDeleteComponents;
-    private CookieConfig authCookie;
-    private String aafNamespace;
     private String workloadContext;
     private EnvironmentContext environmentContext;
     private List<GabConfig> gabConfig;
     private EcompPortalConfig ecompPortal;
     private List<ArtifactConfiguration> artifacts;
     private Map<String, Map<String, List<String>>> componentAllowedInstanceTypes;
+    private ExternalCsarStore externalCsarStore;
+    private CsarFormat csarFormat;
+    private String componentInstanceCounterDelimiter;
+    private String dataValidatorFilterExcludedUrls; // Comma separated list of excluded URLs by the DataValidatorFilter
+    private String permittedAncestors; // Space separated list of permitted ancestors
 
     @SuppressWarnings("unchecked")
     private <K, V> Map<K, V> safeGetCapsInsensitiveMap(Map<K, V> map) {
@@ -166,6 +171,10 @@ public class Configuration extends BasicConfiguration {
         return safeGetCapsInsensitiveMap(excludedGroupTypesMapping);
     }
 
+    public List<Map<String, Map<String, String>>> getDefaultImports() {
+        return Collections.unmodifiableList(defaultImports);
+    }
+
     @Override
     public String toString() {
         return new StringBuilder().append(format("backend host: %s%n", beFqdn)).append(format("backend http port: %s%n", beHttpPort))
@@ -195,31 +204,6 @@ public class Configuration extends BasicConfiguration {
         return globalCsarImports;
     }
 
-    @Getter
-    @Setter
-    @NoArgsConstructor
-    public static class CookieConfig {
-
-        private String securityKey = "";
-        private long maxSessionTimeOut = 600 * 1000L;
-        private long sessionIdleTimeOut = 30 * 1000L;
-        private String cookieName = "AuthenticationCookie";
-        private String redirectURL = "https://www.e-access.att.com/ecomp_portal_ist/ecompportal/process_csp";
-        private List<String> excludedUrls;
-        private List<String> onboardingExcludedUrls;
-        private String domain = "";
-        private String path = "";
-        private boolean isHttpOnly = true;
-
-        public boolean isHttpOnly() {
-            return isHttpOnly;
-        }
-
-        public void setIsHttpOnly(final boolean isHttpOnly) {
-            this.isHttpOnly = isHttpOnly;
-        }
-    }
-
     @Getter
     @Setter
     @NoArgsConstructor
@@ -237,12 +221,14 @@ public class Configuration extends BasicConfiguration {
         private String username;
         private String password;
         private boolean ssl;
+        private String keystorePath;
+        private String keystorePassword;
         private String truststorePath;
         private String truststorePassword;
         private int maxWaitSeconds = 120;
 
         public Integer getCassandraPort() {
-            return cassandraPort != null ? cassandraPort : Configuration.CassandrConfig.CASSANDRA_DEFAULT_PORT;
+            return cassandraPort != null ? cassandraPort : CASSANDRA_DEFAULT_PORT;
         }
 
         @Getter
@@ -344,7 +330,10 @@ public class Configuration extends BasicConfiguration {
         private String protocol = "http";
         private String host;
         private Integer port;
-        private String downloadCsarUri;
+        private String getLatestVspPackageUri;
+        private String getVspPackageUri;
+        private String getVspUri;
+        private String getLatestVspUri;
         @ToString.Exclude
         private String healthCheckUri;
     }
@@ -476,4 +465,53 @@ 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;
+        private int uploadPartSize;
+
+        @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;
+        }
+    }
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    public static class CsarFormat {
+
+        private String defaultFormat;
+    }
+
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    public static class CustomToscaFunction {
+
+        private String name;
+        private String type;
+    }
+
 }