package org.onap.so.asdc.client;
-
import java.security.GeneralSecurityException;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.onap.sdc.api.consumer.IConfiguration;
import org.onap.so.utils.CryptoUtils;
public class ASDCConfiguration implements IConfiguration {
// SHell command to obtain the same encryption, 128 bits key, key must be HEX
- // echo -n "This is a test string" | openssl aes-128-ecb -e -K 546573746F736973546573746F736973 -nosalt | xxd
-
- private static Logger logger = LoggerFactory.getLogger(ASDCConfiguration.class);
+ // echo -n "This is a test string" | openssl aes-128-ecb -e -K 546573746F736973546573746F736973
+ // -nosalt | xxd
+ private static final Logger logger = LoggerFactory.getLogger(ASDCConfiguration.class);
private String asdcControllerName;
public static final String WORKFLOW = "WORKFLOW";
public static final String VF_MODULES_METADATA = "VF_MODULES_METADATA";
public static final String CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT = "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT";
+ public static final String HELM = "HELM";
+
private static final String[] SUPPORTED_ARTIFACT_TYPES = {HEAT, HEAT_ARTIFACT, HEAT_ENV, HEAT_NESTED, HEAT_NET,
- HEAT_VOL, OTHER, TOSCA_CSAR, VF_MODULES_METADATA, CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, WORKFLOW};
+ HEAT_VOL, OTHER, TOSCA_CSAR, VF_MODULES_METADATA, WORKFLOW, CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT, HELM};
+
- public static final List<String> SUPPORTED_ARTIFACT_TYPES_LIST =
- Collections.unmodifiableList(Arrays.asList(SUPPORTED_ARTIFACT_TYPES));
+ public static final List<String> SUPPORTED_ARTIFACT_TYPES_LIST = List.of(SUPPORTED_ARTIFACT_TYPES);
@Autowired
private Environment env;
@Value("${mso.asdc.config.key}")
private String configKey;
- @Value("${mso.asdc-connections.asdc-controller1.messageBusAddress}")
- private String[] messageBusAddress;
-
-
public void setAsdcControllerName(String asdcControllerName) {
this.asdcControllerName = asdcControllerName;
}
@Override
- public java.lang.Boolean isUseHttpsWithDmaap() {
- return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.useHttpsWithDmaap", true);
+ public Boolean isUseHttpsWithSDC() {
+ return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.useHttpsWithSdc", true);
}
@Override
return true;
}
- @Override
- public List<String> getMsgBusAddress() {
- if (messageBusAddress.length > 0) {
- return Arrays.asList(messageBusAddress);
- } else {
- return Collections.emptyList();
- }
-
-
- }
-
public String getAsdcControllerName() {
return asdcControllerName;
}
-
@Override
public String getConsumerGroup() {
return getPropertyOrNull("mso.asdc-connections.asdc-controller1.consumerGroup");
return defaultValue;
} else {
try {
- return Boolean.valueOf(config);
+ return Boolean.parseBoolean(config);
} catch (Exception e) {
+ logger.warn("Exception while getting boolean property with default property", e);
return defaultValue;
}
}
@Override
public List<String> getRelevantArtifactTypes() {
- // DO not return the Static List SUPPORTED_ARTIFACT_TYPES_LIST because the ASDC Client will try to modify it !!!
+ // DO not return the Static List SUPPORTED_ARTIFACT_TYPES_LIST because the ASDC Client will
+ // try to modify it !!!
return Arrays.asList(SUPPORTED_ARTIFACT_TYPES);
}
}
@Override
- public String getAsdcAddress() {
- return getPropertyOrNull("mso.asdc-connections.asdc-controller1.asdcAddress");
+ public String getSdcAddress() {
+ return getPropertyOrNull("mso.asdc-connections.asdc-controller1.sdcAddress");
}
@Override
return getBooleanPropertyWithDefault("mso.asdc-connections.asdc-controller1.isFilterInEmptyResources", true);
}
+ @Override
+ public String getHttpProxyHost() {
+ return getPropertyOrNull("mso.asdc-connections.asdc-controller1.httpProxyHost");
+ }
+
+ @Override
+ public int getHttpProxyPort() {
+ return getIntegerPropertyOrZero("mso.asdc-connections.asdc-controller1.httpProxyPort");
+ }
+
+ @Override
+ public String getHttpsProxyHost() {
+ return getPropertyOrNull("mso.asdc-connections.asdc-controller1.httpsProxyHost");
+ }
+
+ @Override
+ public int getHttpsProxyPort() {
+ return getIntegerPropertyOrZero("mso.asdc-connections.asdc-controller1.httpsProxyPort");
+ }
+
}