diff options
Diffstat (limited to 'sdc-distribution-client/src/main/java/org/openecomp/sdc/utils')
3 files changed, 55 insertions, 7 deletions
diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java index 47333d5..6ac4d35 100644 --- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java +++ b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionActionResultEnum.java @@ -43,6 +43,9 @@ public enum DistributionActionResultEnum { CONF_MISSING_ENVIRONMENT_NAME, CONF_MISSING_CONSUMER_GROUP, CONF_INVALID_ASDC_FQDN, + CONF_INVALID_CONSUME_PRODUCE_STATUS_TOPIC_FALG, + CONF_MISSING_MSG_BUS_ADDRESS, + CONF_INVALID_MSG_BUS_ADDRESS, ASDC_AUTHENTICATION_FAILED, ASDC_AUTHORIZATION_FAILED, ASDC_NOT_FOUND, diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java index 1d2d03c..13fcfcc 100644 --- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java +++ b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/DistributionStatusEnum.java @@ -21,21 +21,36 @@ package org.openecomp.sdc.utils; public enum DistributionStatusEnum { - /**Can be sent when ECOMP component successfully downloaded the specific artifact*/ + /**Can be sent when ONAP component successfully downloaded the specific artifact*/ DOWNLOAD_OK, - /**Can be sent when ECOMP component failed to download the specific artifact (corrupted file)*/ + /**Can be sent when ONAP component failed to download the specific artifact (corrupted file)*/ DOWNLOAD_ERROR, - /**Can be sent only if the repeated distribution notification event is sent when the ECOMP component already downloaded the artifact , but still not stored it in the local repository .*/ + /**Can be sent only if the repeated distribution notification event is sent when the ONAP component already downloaded the artifact , but still not stored it in the local repository .*/ ALREADY_DOWNLOADED, - /**Can be sent when ECOMP component successfully deployed the specific artifact in the local repository*/ + /**Can be sent when ONAP component successfully deployed the specific artifact in the local repository*/ DEPLOY_OK, - /**Can be sent when ECOMP component failed to store the downloaded artifact in the local repository*/ + /**Can be sent when ONAP component failed to store the downloaded artifact in the local repository*/ DEPLOY_ERROR, /**Sent when the repeated distribution notification event is sent for already stored in the local repository service artifact ( artifact's version and checksum match the one stored in the local repository)*/ - ALREADY_DEPLOYED + ALREADY_DEPLOYED, + /** + * ONAP component is requested to publish this status once component successfully complete downloading and storing all the data it needs from the service. + */ + COMPONENT_DONE_OK, + + /**ONAP component is requested to publish this status when component failed to download or failed to store one or more of the mandatory information it requires from the service model. + + It is recommended to populate the errorReason field with appropriate description of the error +*/ + COMPONENT_DONE_ERROR, + /** The DISTRIBUTION_COMPLETE_OK/ERROR status indicating the overall ONAP components status of retrieving and storing the information. +*/ + DISTRIBUTION_COMPLETE_OK, + + DISTRIBUTION_COMPLETE_ERROR } diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java index 9d786d0..0f76574 100644 --- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java +++ b/sdc-distribution-client/src/main/java/org/openecomp/sdc/utils/GeneralUtils.java @@ -20,12 +20,22 @@ package org.openecomp.sdc.utils; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; import java.util.regex.Pattern; import org.apache.commons.codec.binary.Base64; +import org.openecomp.sdc.api.results.IDistributionClientResult; +import org.openecomp.sdc.impl.DistributionClientResultImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import fj.data.Either; public class GeneralUtils { - + private static final Logger log = LoggerFactory.getLogger(GeneralUtils.class.getName()); public static String calculateMD5 (String data){ String calculatedMd5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(data); // encode base-64 result @@ -59,4 +69,24 @@ public class GeneralUtils { return isEncoded; } + + public static Either<List<String>, IDistributionClientResult> convertToValidHostName(List<String> msgBusAddresses) { + List<String> uebLocalHostsNames = new ArrayList<>(); + for(String name : msgBusAddresses){ + try { + uebLocalHostsNames.add(InetAddress.getByName(name).getHostName()); + } catch (UnknownHostException e) { + log.debug("UnknownHost: {}", e.getMessage(), e); + } + } + Either<List<String>, IDistributionClientResult> response; + if( uebLocalHostsNames.isEmpty() ){ + response = Either.right(new DistributionClientResultImpl(DistributionActionResultEnum.CONF_INVALID_MSG_BUS_ADDRESS, "configuration is invalid: " + DistributionActionResultEnum.CONF_INVALID_MSG_BUS_ADDRESS.name())); + + } + else{ + response = Either.left(uebLocalHostsNames); + } + return response; + } } |