[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

2 files changed, 750 insertions, 750 deletions

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
index a0de24a9cd..a95d25fcbb 100644
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/client/ASDCController.java
@@ -1,576 +1,576 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.asdc.client;
-
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
-import org.openecomp.sdc.api.consumer.INotificationCallback;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.impl.DistributionClientFactory;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
-import org.openecomp.sdc.utils.DistributionStatusEnum;
-import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;
-import org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException;
-import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;
-import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
-import org.openecomp.mso.asdc.installer.IVfResourceInstaller;
-import org.openecomp.mso.asdc.installer.VfResourceStructure;
-import org.openecomp.mso.asdc.installer.heat.VfResourceInstaller;
-import org.openecomp.mso.asdc.util.ASDCNotificationLogging;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.utils.UUIDChecker;
-
-public class ASDCController {
-
-    protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);
-
-    protected static MsoAlarmLogger alarmLogger = new MsoAlarmLogger ();
-
-    protected boolean isAsdcClientAutoManaged = false;
-
-    protected String controllerName;
-
-    /**
-     * Inner class for Notification callback
-     *
-     *
-     */
-    private final class ASDCNotificationCallBack implements INotificationCallback {
-
-        private ASDCController asdcController;
-
-        ASDCNotificationCallBack (ASDCController controller) {
-            asdcController = controller;
-        }
-
-        /**
-         * This method can be called multiple times at the same moment.
-         * The controller must be thread safe !
-         */
-        @Override
-        public void activateCallback (INotificationData iNotif) {
-            long startTime = System.currentTimeMillis ();
-            UUIDChecker.generateUUID (LOGGER);
-            MsoLogger.setServiceName ("NotificationHandler");
-            MsoLogger.setLogContext (iNotif.getDistributionID (), iNotif.getServiceUUID ());
-            String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources ().size ();
-            LOGGER.debug(event);
-            asdcController.treatNotification (iNotif);
-            LOGGER.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Completed the treatment of the notification");
-        }
-    }
-
-    // ***** Controller STATUS code
-
-    protected int nbOfNotificationsOngoing = 0;
-
-    public int getNbOfNotificationsOngoing () {
-        return nbOfNotificationsOngoing;
-    }
-
-    private ASDCControllerStatus controllerStatus = ASDCControllerStatus.STOPPED;
-
-    protected synchronized final void changeControllerStatus (ASDCControllerStatus newControllerStatus) {
-        switch (newControllerStatus) {
-
-            case BUSY:
-                ++this.nbOfNotificationsOngoing;
-                this.controllerStatus = newControllerStatus;
-                break;
-
-            case IDLE:
-                if (this.nbOfNotificationsOngoing > 1) {
-                    --this.nbOfNotificationsOngoing;
-                } else {
-                    this.nbOfNotificationsOngoing = 0;
-                    this.controllerStatus = newControllerStatus;
-                }
-
-                break;
-            default:
-                this.controllerStatus = newControllerStatus;
-                break;
-
-        }
-    }
-
-    public synchronized final ASDCControllerStatus getControllerStatus () {
-        return this.controllerStatus;
-    }
-
-    // ***** END of Controller STATUS code
-
-    protected ASDCConfiguration asdcConfig;
-    private IDistributionClient distributionClient;
-    private IVfResourceInstaller resourceInstaller;
-
-    public ASDCController (String controllerConfigName) {
-        isAsdcClientAutoManaged = true;
-        this.controllerName = controllerConfigName;
-        this.resourceInstaller = new VfResourceInstaller();
-    }
-
-    public ASDCController (String controllerConfigName, IDistributionClient asdcClient, IVfResourceInstaller resourceinstaller) {
-
-        distributionClient = asdcClient;
-        this.resourceInstaller = resourceinstaller;
-        this.controllerName = controllerConfigName;
-    }
-
-    public ASDCController (String controllerConfigName,IDistributionClient asdcClient) {
-        distributionClient = asdcClient;
-        this.controllerName = controllerConfigName;
-        this.resourceInstaller = new VfResourceInstaller();
-    }
-
-    /**
-     * This method refresh the ASDC Controller config and restart the client.
-     *
-     * @return true if config has been reloaded, false otherwise
-     * @throws ASDCControllerException If case of issue with the init or close called during the config reload
-     * @throws ASDCParametersException If there is an issue with the parameters
-     * @throws IOException In case of the key file could not be loaded properly
-     */
-    public boolean updateConfigIfNeeded () throws ASDCParametersException, ASDCControllerException, IOException {
-        LOGGER.debug ("Checking whether ASDC config must be reloaded");
-
-        try {
-            if (this.asdcConfig != null && this.asdcConfig.hasASDCConfigChanged ()) {
-                LOGGER.debug ("ASDC Config must be reloaded");
-                this.closeASDC ();
-                this.asdcConfig.refreshASDCConfig ();
-                this.initASDC ();
-                return true;
-            } else {
-                LOGGER.debug ("ASDC Config must NOT be reloaded");
-                return false;
-            }
-        } catch (ASDCParametersException ep) {
-            // Try to close it at least to make it consistent with the file specified
-            // We cannot let it run with a different config file, even if it's bad.
-            // This call could potentially throw a ASDCController exception if the controller is currently BUSY.
-            this.closeASDC ();
-
-            throw ep;
-        }
-    }
-
-    /**
-     * This method initializes the ASDC Controller and the ASDC Client.
-     *
-     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be instantiated or if an init
-     *         attempt is done when already initialized
-     * @throws ASDCParametersException If there is an issue with the parameters provided
-     * @throws IOException In case of issues when trying to load the key file
-     */
-    public void initASDC () throws ASDCControllerException, ASDCParametersException, IOException {
-        String event = "Initialize the ASDC Controller";
-        MsoLogger.setServiceName ("InitASDC");
-        LOGGER.debug (event);
-        if (this.getControllerStatus () != ASDCControllerStatus.STOPPED) {
-            String endEvent = "The controller is already initialized, call the closeASDC method first";
-            throw new ASDCControllerException (endEvent);
-        }
-
-        if (asdcConfig == null) {
-            asdcConfig = new ASDCConfiguration (this.controllerName);
-
-        }
-        // attempt to refresh during init as MsoProperties is may be pointing to an old file
-        // Be careful this is static in MsoProperties
-        asdcConfig.refreshASDCConfig ();
-
-        if (this.distributionClient == null) {
-            distributionClient = DistributionClientFactory.createDistributionClient ();
-        }
-        long initStartTime = System.currentTimeMillis ();
-        IDistributionClientResult result = this.distributionClient.init (asdcConfig,
-                                                                         new ASDCNotificationCallBack (this));
-        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {
-            String endEvent = "ASDC distribution client init failed with reason:"
-                              + result.getDistributionMessageResult ();
-            LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, "Initialization of the ASDC Controller failed with reason:" + result.getDistributionMessageResult (), "ASDC", "init", null);
-            LOGGER.debug (endEvent);
-            asdcConfig = null;
-
-            this.changeControllerStatus (ASDCControllerStatus.STOPPED);
-            throw new ASDCControllerException ("Initialization of the ASDC Controller failed with reason: "
-                                               + result.getDistributionMessageResult ());
-        }
-        LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully initialize ASDC Controller", "ASDC", "init", null);
-
-        long clientstartStartTime = System.currentTimeMillis ();
-        result = this.distributionClient.start ();
-        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {
-            String endEvent = "ASDC distribution client start failed with reason:"
-                              + result.getDistributionMessageResult ();
-            LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, endEvent, "ASDC", "start", null);
-            LOGGER.debug (endEvent);
-            asdcConfig = null;
-            this.changeControllerStatus (ASDCControllerStatus.STOPPED);
-            throw new ASDCControllerException ("Startup of the ASDC Controller failed with reason: "
-                                               + result.getDistributionMessageResult ());
-        }
-        LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully start ASDC distribution client", "ASDC", "start", null);
-
-
-        this.changeControllerStatus (ASDCControllerStatus.IDLE);
-        LOGGER.info (MessageEnum.ASDC_INIT_ASDC_CLIENT_SUC, "ASDC", "changeControllerStatus");
-    }
-
-    /**
-     * This method closes the ASDC Controller and the ASDC Client.
-     *
-     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be closed because
-     *         it's currently BUSY in processing notifications.
-     */
-    public void closeASDC () throws ASDCControllerException {
-
-        MsoLogger.setServiceName ("CloseController");
-        if (this.getControllerStatus () == ASDCControllerStatus.BUSY) {
-            throw new ASDCControllerException ("Cannot close the ASDC controller as it's currently in BUSY state");
-        }
-        if (this.distributionClient != null) {
-            this.distributionClient.stop ();
-            // If auto managed we can set it to Null, ASDCController controls it.
-            // In the other case the client of this class has specified it, so we can't reset it
-            if (isAsdcClientAutoManaged) {
-                // Next init will initialize it with a new ASDC Client
-                this.distributionClient = null;
-            }
-
-        }
-        this.changeControllerStatus (ASDCControllerStatus.STOPPED);
-    }
-
-    private boolean checkResourceAlreadyDeployed (VfResourceStructure resource) throws ArtifactInstallerException {
-
-        if (this.resourceInstaller.isResourceAlreadyDeployed (resource)) {
-            LOGGER.info (MessageEnum.ASDC_ARTIFACT_ALREADY_EXIST,
-                    resource.getResourceInstance().getResourceInstanceName(),
-                    resource.getResourceInstance().getResourceUUID(),
-                    resource.getResourceInstance().getResourceName(), "", "");
-
-            this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DOWNLOADED,null);
-            this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DEPLOYED,null);
-
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-    private final static String UUID_PARAM = "(UUID:";
-
-    private IDistributionClientDownloadResult downloadTheArtifact (IArtifactInfo artifact,
-                                                                   String distributionId) throws ASDCDownloadException {
-
-        LOGGER.debug ("Trying to download the artifact : " + artifact.getArtifactURL ()
-                      + UUID_PARAM
-                      + artifact.getArtifactUUID ()
-                      + ")");
-        IDistributionClientDownloadResult downloadResult;
-
-
-        try {
-            downloadResult = distributionClient.download (artifact);
-            if (null == downloadResult) {
-            	LOGGER.info (MessageEnum.ASDC_ARTIFACT_NULL, artifact.getArtifactUUID (), "", "");
-            	return downloadResult;
-            }
-        } catch (RuntimeException e) {
-            LOGGER.debug ("Not able to download the artifact due to an exception: " + artifact.getArtifactURL ());
-            this.sendASDCNotification (NotificationType.DOWNLOAD,
-                                       artifact.getArtifactURL (),
-                                       asdcConfig.getConsumerID (),
-                                       distributionId,
-                                       DistributionStatusEnum.DOWNLOAD_ERROR,
-                                       e.getMessage (),
-                                       System.currentTimeMillis ());
-
-            throw new ASDCDownloadException ("Exception caught when downloading the artifact", e);
-        }
-
-        if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult ())) {
-
-            LOGGER.info (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_SUC,
-                         artifact.getArtifactURL (),
-                         artifact.getArtifactUUID (),
-                         String.valueOf (downloadResult.getArtifactPayload ().length), "", "");
-
-        } else {
-
-            LOGGER.error (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,
-                          artifact.getArtifactName (),
-                          artifact.getArtifactURL (),
-                          artifact.getArtifactUUID (),
-                          downloadResult.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC artifact download fail");
-
-            this.sendASDCNotification (NotificationType.DOWNLOAD,
-                                       artifact.getArtifactURL (),
-                                       asdcConfig.getConsumerID (),
-                                       distributionId,
-                                       DistributionStatusEnum.DOWNLOAD_ERROR,
-                                       downloadResult.getDistributionMessageResult (),
-                                       System.currentTimeMillis ());
-
-            throw new ASDCDownloadException ("Artifact " + artifact.getArtifactName ()
-                                             + " could not be downloaded from ASDC URL "
-                                             + artifact.getArtifactURL ()
-                                             + UUID_PARAM
-                                             + artifact.getArtifactUUID ()
-                                             + ")"
-                                             + System.lineSeparator ()
-                                             + "Error message is "
-                                             + downloadResult.getDistributionMessageResult ()
-                                             + System.lineSeparator ());
-
-        }
-
-        this.sendASDCNotification (NotificationType.DOWNLOAD,
-                                   artifact.getArtifactURL (),
-                                   asdcConfig.getConsumerID (),
-                                   distributionId,
-                                   DistributionStatusEnum.DOWNLOAD_OK,
-                                   null,
-                                   System.currentTimeMillis ());
-        return downloadResult;
-
-    }
-
-
-    private void sendDeployNotificationsForResource(VfResourceStructure vfResourceStructure,DistributionStatusEnum distribStatus, String errorReason) {
-
-    	for (IArtifactInfo artifactInfo : vfResourceStructure.getResourceInstance().getArtifacts()) {
-
-    		if (DistributionStatusEnum.DEPLOY_OK.equals(distribStatus)
-    				// This could be NULL if the artifact is a VF module artifact, this won't be present in the MAP
-    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()) != null
-    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()).getDeployedInDb() == 0) {
-    			this.sendASDCNotification (NotificationType.DEPLOY,
-	    				artifactInfo.getArtifactURL (),
-	                  asdcConfig.getConsumerID (),
-	                  vfResourceStructure.getNotification().getDistributionID(),
-	                  DistributionStatusEnum.DEPLOY_ERROR,
-	                  "The artifact has not been used by the modules defined in the resource",
-	                  System.currentTimeMillis ());
-    		} else {
-	    		this.sendASDCNotification (NotificationType.DEPLOY,
-	    				artifactInfo.getArtifactURL (),
-	                  asdcConfig.getConsumerID (),
-	                  vfResourceStructure.getNotification().getDistributionID(),
-	                  distribStatus,
-	                  errorReason,
-	                  System.currentTimeMillis ());
-    		}
-    	}
-    }
-
-    private void deployResourceStructure (VfResourceStructure resourceStructure) throws ArtifactInstallerException {
-
-    	LOGGER.info (MessageEnum.ASDC_START_DEPLOY_ARTIFACT, resourceStructure.getResourceInstance().getResourceInstanceName(), resourceStructure.getResourceInstance().getResourceUUID(), "ASDC", "deployResourceStructure");
-        try {
-        	String resourceType = resourceStructure.getResourceInstance().getResourceType();
-        	String category = resourceStructure.getResourceInstance().getCategory();
-        	if(resourceType.equals("VF") && !category.equalsIgnoreCase("Allotted Resource")){
-        		resourceStructure.createVfModuleStructures();
-        	}
-        	resourceInstaller.installTheResource (resourceStructure);
-
-        } catch (ArtifactInstallerException e) {
-
-        	sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_ERROR,e.getMessage());
-        	throw e;
-        }
-
-        if (resourceStructure.isDeployedSuccessfully()) {
-	        LOGGER.info (MessageEnum.ASDC_ARTIFACT_DEPLOY_SUC,
-	           		resourceStructure.getResourceInstance().getResourceName(),
-	          		resourceStructure.getResourceInstance().getResourceUUID(),
-	                String.valueOf (resourceStructure.getVfModuleStructure().size()), "ASDC", "deployResourceStructure");
-	        sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_OK ,null);
-        }
-
-    }
-
-    private enum NotificationType {
-    	DOWNLOAD, DEPLOY
-    }
-
-    private void sendASDCNotification (NotificationType notificationType,
-                                       String artifactURL,
-                                       String consumerID,
-                                       String distributionID,
-                                       DistributionStatusEnum status,
-                                       String errorReason,
-                                       long timestamp) {
-
-        String event = "Sending " + notificationType.name ()
-                       + "("
-                       + status.name ()
-                       + ")"
-                       + " notification to ASDC for artifact:"
-                       + artifactURL;
-
-        if (errorReason != null) {
-        	event=event+"("+errorReason+")";
-        }
-        LOGGER.info (MessageEnum.ASDC_SEND_NOTIF_ASDC, notificationType.name (), status.name (), artifactURL, "ASDC", "sendASDCNotification");
-        LOGGER.debug (event);
-
-        long subStarttime = System.currentTimeMillis ();
-        String action = "";
-        try {
-            IDistributionStatusMessage message = new DistributionStatusMessage (artifactURL,
-                                                                                consumerID,
-                                                                                distributionID,
-                                                                                status,
-                                                                                timestamp);
-
-            switch (notificationType) {
-                case DOWNLOAD:
-                    if (errorReason != null) {
-                        this.distributionClient.sendDownloadStatus (message, errorReason);
-                    } else {
-                        this.distributionClient.sendDownloadStatus (message);
-                    }
-                    action = "sendDownloadStatus";
-                    break;
-                case DEPLOY:
-                    if (errorReason != null) {
-                        this.distributionClient.sendDeploymentStatus (message, errorReason);
-                    } else {
-                        this.distributionClient.sendDeploymentStatus (message);
-                    }
-                    action = "sendDeploymentdStatus";
-                    break;
-                default:
-                	break;
-            }
-        } catch (RuntimeException e) {
-            // TODO: May be a list containing the unsent notification should be
-            // kept
-            LOGGER.warn (MessageEnum.ASDC_SEND_NOTIF_ASDC_EXEC, "ASDC", "sendASDCNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException - sendASDCNotification", e);
-        }
-        LOGGER.recordMetricEvent (subStarttime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully sent notification to ASDC", "ASDC", action, null);
-    }
-
-    public void treatNotification (INotificationData iNotif) {
-
-    	int noOfArtifacts = 0;
-    	for (IResourceInstance resource : iNotif.getResources ()) {
-    		noOfArtifacts += resource.getArtifacts ().size ();
-    	}
-        LOGGER.info (MessageEnum.ASDC_RECEIVE_CALLBACK_NOTIF,
-                     String.valueOf (noOfArtifacts),
-                     iNotif.getServiceUUID (), "ASDC", "treatNotification");
-
-        try {
-        	LOGGER.debug(ASDCNotificationLogging.dumpASDCNotification(iNotif));
-			LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, iNotif.getServiceUUID(), "ASDC", "treatNotification");
-			this.changeControllerStatus(ASDCControllerStatus.BUSY);
-			// Process only the Resource artifacts in MSO
-			for (IResourceInstance resource : iNotif.getResources()) {
-
-				// We process only VNF(VF) and Network(VL) resources on MSO Side
-				// We process only VNF resource on MSO Side
-				if ("VF".equals(resource.getResourceType()) || "VL".equals(resource.getResourceType())) {
-					this.processResourceNotification(iNotif,resource);
-				}
-			}
-
-
-
-        } catch (RuntimeException e) {
-            LOGGER.error (MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
-                          "Unexpected exception caught during the notification processing", "ASDC", "treatNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException in treatNotification",
-                          e);
-        } finally {
-            this.changeControllerStatus (ASDCControllerStatus.IDLE);
-        }
-    }
-
-
-    private void processResourceNotification (INotificationData iNotif,IResourceInstance resource) {
-		// For each artifact, create a structure describing the VFModule in a ordered flat level
-    	VfResourceStructure resourceStructure = new VfResourceStructure(iNotif,resource);
-
-		try {
-
-			if (!this.checkResourceAlreadyDeployed(resourceStructure)) {
-				for (IArtifactInfo artifact : resource.getArtifacts()) {
-
-						IDistributionClientDownloadResult resultArtifact = this.downloadTheArtifact(artifact,
-								iNotif.getDistributionID());
-
-						if (resultArtifact != null) {
-							if (ASDCConfiguration.VF_MODULES_METADATA.equals(artifact.getArtifactType())) {
-								LOGGER.debug("VF_MODULE_ARTIFACT: "+new String(resultArtifact.getArtifactPayload(),"UTF-8"));
-								LOGGER.debug(ASDCNotificationLogging.dumpVfModuleMetaDataList(resourceStructure.decodeVfModuleArtifact(resultArtifact.getArtifactPayload())));
-							}
-							resourceStructure.addArtifactToStructure(distributionClient,artifact, resultArtifact);
-
-						}
-
-				}
-
-				this.deployResourceStructure(resourceStructure);
-
-			}
-		} catch (ArtifactInstallerException | ASDCDownloadException | UnsupportedEncodingException e) {
-			LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
-					"Exception caught during Installation of artifact", "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);
-		}
-    }
-
-    private static final String UNKNOWN="Unknown";
-
-    /**
-     * @return the address of the ASDC we are connected to.
-     */
-    public String getAddress () {
-        if (asdcConfig != null) {
-            return asdcConfig.getAsdcAddress ();
-        }
-        return UNKNOWN;
-    }
-
-    /**
-     * @return the environment name of the ASDC we are connected to.
-     */
-    public String getEnvironment () {
-        if (asdcConfig != null) {
-            return asdcConfig.getEnvironmentName ();
-        }
-        return UNKNOWN;
-    }
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+package org.openecomp.mso.asdc.client;

+

+

+import java.io.IOException;

+import java.io.UnsupportedEncodingException;

+import org.openecomp.sdc.api.IDistributionClient;

+import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;

+import org.openecomp.sdc.api.consumer.INotificationCallback;

+import org.openecomp.sdc.api.notification.IArtifactInfo;

+import org.openecomp.sdc.api.notification.INotificationData;

+import org.openecomp.sdc.api.notification.IResourceInstance;

+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;

+import org.openecomp.sdc.api.results.IDistributionClientResult;

+import org.openecomp.sdc.impl.DistributionClientFactory;

+import org.openecomp.sdc.utils.DistributionActionResultEnum;

+import org.openecomp.sdc.utils.DistributionStatusEnum;

+import org.openecomp.mso.asdc.client.exceptions.ASDCControllerException;

+import org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException;

+import org.openecomp.mso.asdc.client.exceptions.ASDCParametersException;

+import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;

+import org.openecomp.mso.asdc.installer.IVfResourceInstaller;

+import org.openecomp.mso.asdc.installer.VfResourceStructure;

+import org.openecomp.mso.asdc.installer.heat.VfResourceInstaller;

+import org.openecomp.mso.asdc.util.ASDCNotificationLogging;

+import org.openecomp.mso.logger.MessageEnum;

+import org.openecomp.mso.logger.MsoAlarmLogger;

+import org.openecomp.mso.logger.MsoLogger;

+import org.openecomp.mso.utils.UUIDChecker;

+

+public class ASDCController {

+

+    protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC);

+

+    protected static MsoAlarmLogger alarmLogger = new MsoAlarmLogger ();

+

+    protected boolean isAsdcClientAutoManaged = false;

+

+    protected String controllerName;

+

+    /**

+     * Inner class for Notification callback

+     *

+     *

+     */

+    private final class ASDCNotificationCallBack implements INotificationCallback {

+

+        private ASDCController asdcController;

+

+        ASDCNotificationCallBack (ASDCController controller) {

+            asdcController = controller;

+        }

+

+        /**

+         * This method can be called multiple times at the same moment.

+         * The controller must be thread safe !

+         */

+        @Override

+        public void activateCallback (INotificationData iNotif) {

+            long startTime = System.currentTimeMillis ();

+            UUIDChecker.generateUUID (LOGGER);

+            MsoLogger.setServiceName ("NotificationHandler");

+            MsoLogger.setLogContext (iNotif.getDistributionID (), iNotif.getServiceUUID ());

+            String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources ().size ();

+            LOGGER.debug(event);

+            asdcController.treatNotification (iNotif);

+            LOGGER.recordAuditEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Completed the treatment of the notification");

+        }

+    }

+

+    // ***** Controller STATUS code

+

+    protected int nbOfNotificationsOngoing = 0;

+

+    public int getNbOfNotificationsOngoing () {

+        return nbOfNotificationsOngoing;

+    }

+

+    private ASDCControllerStatus controllerStatus = ASDCControllerStatus.STOPPED;

+

+    protected synchronized final void changeControllerStatus (ASDCControllerStatus newControllerStatus) {

+        switch (newControllerStatus) {

+

+            case BUSY:

+                ++this.nbOfNotificationsOngoing;

+                this.controllerStatus = newControllerStatus;

+                break;

+

+            case IDLE:

+                if (this.nbOfNotificationsOngoing > 1) {

+                    --this.nbOfNotificationsOngoing;

+                } else {

+                    this.nbOfNotificationsOngoing = 0;

+                    this.controllerStatus = newControllerStatus;

+                }

+

+                break;

+            default:

+                this.controllerStatus = newControllerStatus;

+                break;

+

+        }

+    }

+

+    public synchronized final ASDCControllerStatus getControllerStatus () {

+        return this.controllerStatus;

+    }

+

+    // ***** END of Controller STATUS code

+

+    protected ASDCConfiguration asdcConfig;

+    private IDistributionClient distributionClient;

+    private IVfResourceInstaller resourceInstaller;

+

+    public ASDCController (String controllerConfigName) {

+        isAsdcClientAutoManaged = true;

+        this.controllerName = controllerConfigName;

+        this.resourceInstaller = new VfResourceInstaller();

+    }

+

+    public ASDCController (String controllerConfigName, IDistributionClient asdcClient, IVfResourceInstaller resourceinstaller) {

+

+        distributionClient = asdcClient;

+        this.resourceInstaller = resourceinstaller;

+        this.controllerName = controllerConfigName;

+    }

+

+    public ASDCController (String controllerConfigName,IDistributionClient asdcClient) {

+        distributionClient = asdcClient;

+        this.controllerName = controllerConfigName;

+        this.resourceInstaller = new VfResourceInstaller();

+    }

+

+    /**

+     * This method refresh the ASDC Controller config and restart the client.

+     *

+     * @return true if config has been reloaded, false otherwise

+     * @throws ASDCControllerException If case of issue with the init or close called during the config reload

+     * @throws ASDCParametersException If there is an issue with the parameters

+     * @throws IOException In case of the key file could not be loaded properly

+     */

+    public boolean updateConfigIfNeeded () throws ASDCParametersException, ASDCControllerException, IOException {

+        LOGGER.debug ("Checking whether ASDC config must be reloaded");

+

+        try {

+            if (this.asdcConfig != null && this.asdcConfig.hasASDCConfigChanged ()) {

+                LOGGER.debug ("ASDC Config must be reloaded");

+                this.closeASDC ();

+                this.asdcConfig.refreshASDCConfig ();

+                this.initASDC ();

+                return true;

+            } else {

+                LOGGER.debug ("ASDC Config must NOT be reloaded");

+                return false;

+            }

+        } catch (ASDCParametersException ep) {

+            // Try to close it at least to make it consistent with the file specified

+            // We cannot let it run with a different config file, even if it's bad.

+            // This call could potentially throw a ASDCController exception if the controller is currently BUSY.

+            this.closeASDC ();

+

+            throw ep;

+        }

+    }

+

+    /**

+     * This method initializes the ASDC Controller and the ASDC Client.

+     *

+     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be instantiated or if an init

+     *         attempt is done when already initialized

+     * @throws ASDCParametersException If there is an issue with the parameters provided

+     * @throws IOException In case of issues when trying to load the key file

+     */

+    public void initASDC () throws ASDCControllerException, ASDCParametersException, IOException {

+        String event = "Initialize the ASDC Controller";

+        MsoLogger.setServiceName ("InitASDC");

+        LOGGER.debug (event);

+        if (this.getControllerStatus () != ASDCControllerStatus.STOPPED) {

+            String endEvent = "The controller is already initialized, call the closeASDC method first";

+            throw new ASDCControllerException (endEvent);

+        }

+

+        if (asdcConfig == null) {

+            asdcConfig = new ASDCConfiguration (this.controllerName);

+

+        }

+        // attempt to refresh during init as MsoProperties is may be pointing to an old file

+        // Be careful this is static in MsoProperties

+        asdcConfig.refreshASDCConfig ();

+

+        if (this.distributionClient == null) {

+            distributionClient = DistributionClientFactory.createDistributionClient ();

+        }

+        long initStartTime = System.currentTimeMillis ();

+        IDistributionClientResult result = this.distributionClient.init (asdcConfig,

+                                                                         new ASDCNotificationCallBack (this));

+        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {

+            String endEvent = "ASDC distribution client init failed with reason:"

+                              + result.getDistributionMessageResult ();

+            LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, "Initialization of the ASDC Controller failed with reason:" + result.getDistributionMessageResult (), "ASDC", "init", null);

+            LOGGER.debug (endEvent);

+            asdcConfig = null;

+

+            this.changeControllerStatus (ASDCControllerStatus.STOPPED);

+            throw new ASDCControllerException ("Initialization of the ASDC Controller failed with reason: "

+                                               + result.getDistributionMessageResult ());

+        }

+        LOGGER.recordMetricEvent (initStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully initialize ASDC Controller", "ASDC", "init", null);

+

+        long clientstartStartTime = System.currentTimeMillis ();

+        result = this.distributionClient.start ();

+        if (!result.getDistributionActionResult ().equals (DistributionActionResultEnum.SUCCESS)) {

+            String endEvent = "ASDC distribution client start failed with reason:"

+                              + result.getDistributionMessageResult ();

+            LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.UnknownError, endEvent, "ASDC", "start", null);

+            LOGGER.debug (endEvent);

+            asdcConfig = null;

+            this.changeControllerStatus (ASDCControllerStatus.STOPPED);

+            throw new ASDCControllerException ("Startup of the ASDC Controller failed with reason: "

+                                               + result.getDistributionMessageResult ());

+        }

+        LOGGER.recordMetricEvent (clientstartStartTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully start ASDC distribution client", "ASDC", "start", null);

+

+

+        this.changeControllerStatus (ASDCControllerStatus.IDLE);

+        LOGGER.info (MessageEnum.ASDC_INIT_ASDC_CLIENT_SUC, "ASDC", "changeControllerStatus");

+    }

+

+    /**

+     * This method closes the ASDC Controller and the ASDC Client.

+     *

+     * @throws ASDCControllerException It throws an exception if the ASDC Client cannot be closed because

+     *         it's currently BUSY in processing notifications.

+     */

+    public void closeASDC () throws ASDCControllerException {

+

+        MsoLogger.setServiceName ("CloseController");

+        if (this.getControllerStatus () == ASDCControllerStatus.BUSY) {

+            throw new ASDCControllerException ("Cannot close the ASDC controller as it's currently in BUSY state");

+        }

+        if (this.distributionClient != null) {

+            this.distributionClient.stop ();

+            // If auto managed we can set it to Null, ASDCController controls it.

+            // In the other case the client of this class has specified it, so we can't reset it

+            if (isAsdcClientAutoManaged) {

+                // Next init will initialize it with a new ASDC Client

+                this.distributionClient = null;

+            }

+

+        }

+        this.changeControllerStatus (ASDCControllerStatus.STOPPED);

+    }

+

+    private boolean checkResourceAlreadyDeployed (VfResourceStructure resource) throws ArtifactInstallerException {

+

+        if (this.resourceInstaller.isResourceAlreadyDeployed (resource)) {

+            LOGGER.info (MessageEnum.ASDC_ARTIFACT_ALREADY_EXIST,

+                    resource.getResourceInstance().getResourceInstanceName(),

+                    resource.getResourceInstance().getResourceUUID(),

+                    resource.getResourceInstance().getResourceName(), "", "");

+

+            this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DOWNLOADED,null);

+            this.sendDeployNotificationsForResource(resource,DistributionStatusEnum.ALREADY_DEPLOYED,null);

+

+            return true;

+        } else {

+            return false;

+        }

+

+    }

+

+    private final static String UUID_PARAM = "(UUID:";

+

+    private IDistributionClientDownloadResult downloadTheArtifact (IArtifactInfo artifact,

+                                                                   String distributionId) throws ASDCDownloadException {

+

+        LOGGER.debug ("Trying to download the artifact : " + artifact.getArtifactURL ()

+                      + UUID_PARAM

+                      + artifact.getArtifactUUID ()

+                      + ")");

+        IDistributionClientDownloadResult downloadResult;

+

+

+        try {

+            downloadResult = distributionClient.download (artifact);

+            if (null == downloadResult) {

+            	LOGGER.info (MessageEnum.ASDC_ARTIFACT_NULL, artifact.getArtifactUUID (), "", "");

+            	return downloadResult;

+            }

+        } catch (RuntimeException e) {

+            LOGGER.debug ("Not able to download the artifact due to an exception: " + artifact.getArtifactURL ());

+            this.sendASDCNotification (NotificationType.DOWNLOAD,

+                                       artifact.getArtifactURL (),

+                                       asdcConfig.getConsumerID (),

+                                       distributionId,

+                                       DistributionStatusEnum.DOWNLOAD_ERROR,

+                                       e.getMessage (),

+                                       System.currentTimeMillis ());

+

+            throw new ASDCDownloadException ("Exception caught when downloading the artifact", e);

+        }

+

+        if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult ())) {

+

+            LOGGER.info (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_SUC,

+                         artifact.getArtifactURL (),

+                         artifact.getArtifactUUID (),

+                         String.valueOf (downloadResult.getArtifactPayload ().length), "", "");

+

+        } else {

+

+            LOGGER.error (MessageEnum.ASDC_ARTIFACT_DOWNLOAD_FAIL,

+                          artifact.getArtifactName (),

+                          artifact.getArtifactURL (),

+                          artifact.getArtifactUUID (),

+                          downloadResult.getDistributionMessageResult (), "", "", MsoLogger.ErrorCode.DataError, "ASDC artifact download fail");

+

+            this.sendASDCNotification (NotificationType.DOWNLOAD,

+                                       artifact.getArtifactURL (),

+                                       asdcConfig.getConsumerID (),

+                                       distributionId,

+                                       DistributionStatusEnum.DOWNLOAD_ERROR,

+                                       downloadResult.getDistributionMessageResult (),

+                                       System.currentTimeMillis ());

+

+            throw new ASDCDownloadException ("Artifact " + artifact.getArtifactName ()

+                                             + " could not be downloaded from ASDC URL "

+                                             + artifact.getArtifactURL ()

+                                             + UUID_PARAM

+                                             + artifact.getArtifactUUID ()

+                                             + ")"

+                                             + System.lineSeparator ()

+                                             + "Error message is "

+                                             + downloadResult.getDistributionMessageResult ()

+                                             + System.lineSeparator ());

+

+        }

+

+        this.sendASDCNotification (NotificationType.DOWNLOAD,

+                                   artifact.getArtifactURL (),

+                                   asdcConfig.getConsumerID (),

+                                   distributionId,

+                                   DistributionStatusEnum.DOWNLOAD_OK,

+                                   null,

+                                   System.currentTimeMillis ());

+        return downloadResult;

+

+    }

+

+

+    private void sendDeployNotificationsForResource(VfResourceStructure vfResourceStructure,DistributionStatusEnum distribStatus, String errorReason) {

+

+    	for (IArtifactInfo artifactInfo : vfResourceStructure.getResourceInstance().getArtifacts()) {

+

+    		if (DistributionStatusEnum.DEPLOY_OK.equals(distribStatus)

+    				// This could be NULL if the artifact is a VF module artifact, this won't be present in the MAP

+    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()) != null

+    				&& vfResourceStructure.getArtifactsMapByUUID().get(artifactInfo.getArtifactUUID()).getDeployedInDb() == 0) {

+    			this.sendASDCNotification (NotificationType.DEPLOY,

+	    				artifactInfo.getArtifactURL (),

+	                  asdcConfig.getConsumerID (),

+	                  vfResourceStructure.getNotification().getDistributionID(),

+	                  DistributionStatusEnum.DEPLOY_ERROR,

+	                  "The artifact has not been used by the modules defined in the resource",

+	                  System.currentTimeMillis ());

+    		} else {

+	    		this.sendASDCNotification (NotificationType.DEPLOY,

+	    				artifactInfo.getArtifactURL (),

+	                  asdcConfig.getConsumerID (),

+	                  vfResourceStructure.getNotification().getDistributionID(),

+	                  distribStatus,

+	                  errorReason,

+	                  System.currentTimeMillis ());

+    		}

+    	}

+    }

+

+    private void deployResourceStructure (VfResourceStructure resourceStructure) throws ArtifactInstallerException {

+

+    	LOGGER.info (MessageEnum.ASDC_START_DEPLOY_ARTIFACT, resourceStructure.getResourceInstance().getResourceInstanceName(), resourceStructure.getResourceInstance().getResourceUUID(), "ASDC", "deployResourceStructure");

+        try {

+        	String resourceType = resourceStructure.getResourceInstance().getResourceType();

+        	String category = resourceStructure.getResourceInstance().getCategory();

+        	if(resourceType.equals("VF") && !category.equalsIgnoreCase("Allotted Resource")){

+        		resourceStructure.createVfModuleStructures();

+        	}

+        	resourceInstaller.installTheResource (resourceStructure);

+

+        } catch (ArtifactInstallerException e) {

+

+        	sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_ERROR,e.getMessage());

+        	throw e;

+        }

+

+        if (resourceStructure.isDeployedSuccessfully()) {

+	        LOGGER.info (MessageEnum.ASDC_ARTIFACT_DEPLOY_SUC,

+	           		resourceStructure.getResourceInstance().getResourceName(),

+	          		resourceStructure.getResourceInstance().getResourceUUID(),

+	                String.valueOf (resourceStructure.getVfModuleStructure().size()), "ASDC", "deployResourceStructure");

+	        sendDeployNotificationsForResource(resourceStructure,DistributionStatusEnum.DEPLOY_OK ,null);

+        }

+

+    }

+

+    private enum NotificationType {

+    	DOWNLOAD, DEPLOY

+    }

+

+    private void sendASDCNotification (NotificationType notificationType,

+                                       String artifactURL,

+                                       String consumerID,

+                                       String distributionID,

+                                       DistributionStatusEnum status,

+                                       String errorReason,

+                                       long timestamp) {

+

+        String event = "Sending " + notificationType.name ()

+                       + "("

+                       + status.name ()

+                       + ")"

+                       + " notification to ASDC for artifact:"

+                       + artifactURL;

+

+        if (errorReason != null) {

+        	event=event+"("+errorReason+")";

+        }

+        LOGGER.info (MessageEnum.ASDC_SEND_NOTIF_ASDC, notificationType.name (), status.name (), artifactURL, "ASDC", "sendASDCNotification");

+        LOGGER.debug (event);

+

+        long subStarttime = System.currentTimeMillis ();

+        String action = "";

+        try {

+            IDistributionStatusMessage message = new DistributionStatusMessage (artifactURL,

+                                                                                consumerID,

+                                                                                distributionID,

+                                                                                status,

+                                                                                timestamp);

+

+            switch (notificationType) {

+                case DOWNLOAD:

+                    if (errorReason != null) {

+                        this.distributionClient.sendDownloadStatus (message, errorReason);

+                    } else {

+                        this.distributionClient.sendDownloadStatus (message);

+                    }

+                    action = "sendDownloadStatus";

+                    break;

+                case DEPLOY:

+                    if (errorReason != null) {

+                        this.distributionClient.sendDeploymentStatus (message, errorReason);

+                    } else {

+                        this.distributionClient.sendDeploymentStatus (message);

+                    }

+                    action = "sendDeploymentdStatus";

+                    break;

+                default:

+                	break;

+            }

+        } catch (RuntimeException e) {

+            // TODO: May be a list containing the unsent notification should be

+            // kept

+            LOGGER.warn (MessageEnum.ASDC_SEND_NOTIF_ASDC_EXEC, "ASDC", "sendASDCNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException - sendASDCNotification", e);

+        }

+        LOGGER.recordMetricEvent (subStarttime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully sent notification to ASDC", "ASDC", action, null);

+    }

+

+    public void treatNotification (INotificationData iNotif) {

+

+    	int noOfArtifacts = 0;

+    	for (IResourceInstance resource : iNotif.getResources ()) {

+    		noOfArtifacts += resource.getArtifacts ().size ();

+    	}

+        LOGGER.info (MessageEnum.ASDC_RECEIVE_CALLBACK_NOTIF,

+                     String.valueOf (noOfArtifacts),

+                     iNotif.getServiceUUID (), "ASDC", "treatNotification");

+

+        try {

+        	LOGGER.debug(ASDCNotificationLogging.dumpASDCNotification(iNotif));

+			LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, iNotif.getServiceUUID(), "ASDC", "treatNotification");

+			this.changeControllerStatus(ASDCControllerStatus.BUSY);

+			// Process only the Resource artifacts in MSO

+			for (IResourceInstance resource : iNotif.getResources()) {

+

+				// We process only VNF(VF) and Network(VL) resources on MSO Side

+				// We process only VNF resource on MSO Side

+				if ("VF".equals(resource.getResourceType()) || "VL".equals(resource.getResourceType())) {

+					this.processResourceNotification(iNotif,resource);

+				}

+			}

+

+

+

+        } catch (RuntimeException e) {

+            LOGGER.error (MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,

+                          "Unexpected exception caught during the notification processing", "ASDC", "treatNotification", MsoLogger.ErrorCode.SchemaError, "RuntimeException in treatNotification",

+                          e);

+        } finally {

+            this.changeControllerStatus (ASDCControllerStatus.IDLE);

+        }

+    }

+

+

+    private void processResourceNotification (INotificationData iNotif,IResourceInstance resource) {

+		// For each artifact, create a structure describing the VFModule in a ordered flat level

+    	VfResourceStructure resourceStructure = new VfResourceStructure(iNotif,resource);

+

+		try {

+

+			if (!this.checkResourceAlreadyDeployed(resourceStructure)) {

+				for (IArtifactInfo artifact : resource.getArtifacts()) {

+

+						IDistributionClientDownloadResult resultArtifact = this.downloadTheArtifact(artifact,

+								iNotif.getDistributionID());

+

+						if (resultArtifact != null) {

+							if (ASDCConfiguration.VF_MODULES_METADATA.equals(artifact.getArtifactType())) {

+								LOGGER.debug("VF_MODULE_ARTIFACT: "+new String(resultArtifact.getArtifactPayload(),"UTF-8"));

+								LOGGER.debug(ASDCNotificationLogging.dumpVfModuleMetaDataList(resourceStructure.decodeVfModuleArtifact(resultArtifact.getArtifactPayload())));

+							}

+							resourceStructure.addArtifactToStructure(distributionClient,artifact, resultArtifact);

+

+						}

+

+				}

+

+				this.deployResourceStructure(resourceStructure);

+

+			}

+		} catch (ArtifactInstallerException | ASDCDownloadException | UnsupportedEncodingException e) {

+			LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,

+					"Exception caught during Installation of artifact", "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);

+		}

+    }

+

+    private static final String UNKNOWN="Unknown";

+

+    /**

+     * @return the address of the ASDC we are connected to.

+     */

+    public String getAddress () {

+        if (asdcConfig != null) {

+            return asdcConfig.getAsdcAddress ();

+        }

+        return UNKNOWN;

+    }

+

+    /**

+     * @return the environment name of the ASDC we are connected to.

+     */

+    public String getEnvironment () {

+        if (asdcConfig != null) {

+            return asdcConfig.getEnvironmentName ();

+        }

+        return UNKNOWN;

+    }

+

+}

diff --git a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
index 63da38d8c1..d6453b5b4d 100644
--- a/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
+++ b/asdc-controller/src/test/java/org/openecomp/mso/asdc/client/tests/ASDCElementInfoTest.java
@@ -1,174 +1,174 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-
-package org.openecomp.mso.asdc.client.tests;
-
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Collections;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
-import org.openecomp.sdc.api.notification.INotificationData;
-import org.openecomp.sdc.api.notification.IResourceInstance;
-import org.openecomp.sdc.api.notification.IVfModuleMetadata;
-import org.openecomp.mso.asdc.client.ASDCConfiguration;
-import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;
-import org.openecomp.mso.asdc.installer.ASDCElementInfo;
-import org.openecomp.mso.asdc.installer.VfModuleStructure;
-import org.openecomp.mso.asdc.installer.VfResourceStructure;
-import org.openecomp.mso.asdc.installer.IVfModuleData;
-
-public class ASDCElementInfoTest {
-
-	@Test
-	public void createASDCElementInfoWithNullParameterTest() {
-		ASDCElementInfo elementInfoFromNullVfArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(null);
-		ASDCElementInfo elementInfoFromNullVfModuleStructure = ASDCElementInfo.createElementFromVfModuleStructure(null);
-		ASDCElementInfo elementInfoFromNullVfResourceStructure = ASDCElementInfo.createElementFromVfResourceStructure(null);
-
-		elementInfoFromNullVfArtifact.addElementInfo(null, null);
-		elementInfoFromNullVfModuleStructure.addElementInfo(null, "someValue");
-		elementInfoFromNullVfResourceStructure.addElementInfo("someKey", null);
-
-		assertEquals(elementInfoFromNullVfArtifact.toString(), "");
-		assertEquals(elementInfoFromNullVfModuleStructure.toString(), "");
-		assertEquals(elementInfoFromNullVfResourceStructure.toString(), "");
-
-		assertNotNull(elementInfoFromNullVfArtifact);
-		assertNotNull(elementInfoFromNullVfModuleStructure);
-		assertNotNull(elementInfoFromNullVfResourceStructure);
-
-		assertNotNull(ASDCElementInfo.EMPTY_INSTANCE);
-
-		assertEquals(elementInfoFromNullVfArtifact, ASDCElementInfo.EMPTY_INSTANCE);
-		assertEquals(elementInfoFromNullVfModuleStructure, ASDCElementInfo.EMPTY_INSTANCE);
-		assertEquals(elementInfoFromNullVfResourceStructure, ASDCElementInfo.EMPTY_INSTANCE);
-
-		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.getType(), "");
-		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.toString(), "");
-
-		assertEquals(elementInfoFromNullVfArtifact.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
-		assertEquals(elementInfoFromNullVfModuleStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
-		assertEquals(elementInfoFromNullVfResourceStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());
-	}
-
-	@Test
-	public void createASDCElementInfoFromVfResourceTest() {
-
-		String resourceInstanceName = "Resource 1";
-
-		UUID generatedUUID = UUID.randomUUID();
-
-		INotificationData notificationData = Mockito.mock(INotificationData.class);
-		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
-
-		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
-		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
-
-		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
-
-		ASDCElementInfo elementInfoFromVfResource = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure);
-
-		assertTrue(elementInfoFromVfResource.toString().contains(resourceInstanceName));
-		assertTrue(elementInfoFromVfResource.toString().contains(generatedUUID.toString()));
-
-		assertFalse(ASDCConfiguration.VF_MODULES_METADATA.equals(elementInfoFromVfResource.getType()));
-		assertEquals(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name(), elementInfoFromVfResource.getType());
-
-		assertFalse(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
-		elementInfoFromVfResource.addElementInfo("MyInfo1", "someValue");
-		assertTrue(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));
-	}
-
-	@Test
-	public void createASDCElementInfoFromVfModuleTest() throws ArtifactInstallerException {
-
-		String resourceInstanceName = "Resource 1";
-
-		UUID generatedUUID = UUID.randomUUID();
-
-		INotificationData notificationData = Mockito.mock(INotificationData.class);
-		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);
-
-		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);
-		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());
-
-		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);
-
-		// Create module structure now
-
-		String vfModuleModelName = "Module Model XYZ";
-
-		UUID generatedUUIDForModule = UUID.randomUUID();
-
-		IVfModuleData moduleMetadata = Mockito.mock(IVfModuleData.class);
-		Mockito.when(moduleMetadata.getVfModuleModelName()).thenReturn(vfModuleModelName);
-		Mockito.when(moduleMetadata.getVfModuleModelInvariantUUID()).thenReturn(generatedUUIDForModule.toString());
-		Mockito.when(moduleMetadata.getArtifacts()).thenReturn(Collections.<String> emptyList());
-
-		VfModuleStructure vfModuleStructure = new VfModuleStructure(vfResourceStructure, moduleMetadata);
-
-		ASDCElementInfo elementInfoFromVfModule = ASDCElementInfo.createElementFromVfModuleStructure(vfModuleStructure);
-
-		assertTrue(elementInfoFromVfModule.toString().contains(vfModuleModelName));
-		assertTrue(elementInfoFromVfModule.toString().contains(generatedUUIDForModule.toString()));
-
-		assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromVfModule.getType()));
-		assertEquals(ASDCConfiguration.VF_MODULES_METADATA, elementInfoFromVfModule.getType());
-
-		assertFalse(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
-		elementInfoFromVfModule.addElementInfo("MyInfo2", "someValue");
-		assertTrue(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));
-	}
-
-	@Test
-	public void createASDCElementInfoFromArtifact() {
-		for (String eVal : ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST) {
-			String generatedArtifactName = eVal + " 1";
-			UUID generatedUUIDForArtifact = UUID.randomUUID();
-
-			IArtifactInfo artifactInfo = Mockito.mock(IArtifactInfo.class);
-			Mockito.when(artifactInfo.getArtifactType()).thenReturn(eVal);
-			Mockito.when(artifactInfo.getArtifactName()).thenReturn(generatedArtifactName);
-			Mockito.when(artifactInfo.getArtifactUUID()).thenReturn(generatedUUIDForArtifact.toString());
-
-			ASDCElementInfo elementInfoFromArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(artifactInfo);
-
-			assertTrue(elementInfoFromArtifact.toString().contains(generatedArtifactName));
-			assertTrue(elementInfoFromArtifact.toString().contains(generatedUUIDForArtifact.toString()));
-
-			assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromArtifact.getType()));
-			assertEquals(eVal, elementInfoFromArtifact.getType());
-
-			assertFalse(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
-			elementInfoFromArtifact.addElementInfo("MyInfo3", "someValue");
-			assertTrue(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));
-		}
-	}
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.

+ * ================================================================================

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ * ============LICENSE_END=========================================================

+ */

+

+

+package org.openecomp.mso.asdc.client.tests;

+

+

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertTrue;

+

+import java.util.Collections;

+import java.util.UUID;

+

+import org.junit.Test;

+import org.mockito.Mockito;

+import org.openecomp.sdc.api.notification.IArtifactInfo;

+import org.openecomp.sdc.api.notification.INotificationData;

+import org.openecomp.sdc.api.notification.IResourceInstance;

+import org.openecomp.sdc.api.notification.IVfModuleMetadata;

+import org.openecomp.mso.asdc.client.ASDCConfiguration;

+import org.openecomp.mso.asdc.client.exceptions.ArtifactInstallerException;

+import org.openecomp.mso.asdc.installer.ASDCElementInfo;

+import org.openecomp.mso.asdc.installer.VfModuleStructure;

+import org.openecomp.mso.asdc.installer.VfResourceStructure;

+import org.openecomp.mso.asdc.installer.IVfModuleData;

+

+public class ASDCElementInfoTest {

+

+	@Test

+	public void createASDCElementInfoWithNullParameterTest() {

+		ASDCElementInfo elementInfoFromNullVfArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(null);

+		ASDCElementInfo elementInfoFromNullVfModuleStructure = ASDCElementInfo.createElementFromVfModuleStructure(null);

+		ASDCElementInfo elementInfoFromNullVfResourceStructure = ASDCElementInfo.createElementFromVfResourceStructure(null);

+

+		elementInfoFromNullVfArtifact.addElementInfo(null, null);

+		elementInfoFromNullVfModuleStructure.addElementInfo(null, "someValue");

+		elementInfoFromNullVfResourceStructure.addElementInfo("someKey", null);

+

+		assertEquals(elementInfoFromNullVfArtifact.toString(), "");

+		assertEquals(elementInfoFromNullVfModuleStructure.toString(), "");

+		assertEquals(elementInfoFromNullVfResourceStructure.toString(), "");

+

+		assertNotNull(elementInfoFromNullVfArtifact);

+		assertNotNull(elementInfoFromNullVfModuleStructure);

+		assertNotNull(elementInfoFromNullVfResourceStructure);

+

+		assertNotNull(ASDCElementInfo.EMPTY_INSTANCE);

+

+		assertEquals(elementInfoFromNullVfArtifact, ASDCElementInfo.EMPTY_INSTANCE);

+		assertEquals(elementInfoFromNullVfModuleStructure, ASDCElementInfo.EMPTY_INSTANCE);

+		assertEquals(elementInfoFromNullVfResourceStructure, ASDCElementInfo.EMPTY_INSTANCE);

+

+		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.getType(), "");

+		assertEquals(ASDCElementInfo.EMPTY_INSTANCE.toString(), "");

+

+		assertEquals(elementInfoFromNullVfArtifact.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());

+		assertEquals(elementInfoFromNullVfModuleStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());

+		assertEquals(elementInfoFromNullVfResourceStructure.getType(), ASDCElementInfo.EMPTY_INSTANCE.getType());

+	}

+

+	@Test

+	public void createASDCElementInfoFromVfResourceTest() {

+

+		String resourceInstanceName = "Resource 1";

+

+		UUID generatedUUID = UUID.randomUUID();

+

+		INotificationData notificationData = Mockito.mock(INotificationData.class);

+		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);

+

+		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);

+		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());

+

+		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);

+

+		ASDCElementInfo elementInfoFromVfResource = ASDCElementInfo.createElementFromVfResourceStructure(vfResourceStructure);

+

+		assertTrue(elementInfoFromVfResource.toString().contains(resourceInstanceName));

+		assertTrue(elementInfoFromVfResource.toString().contains(generatedUUID.toString()));

+

+		assertFalse(ASDCConfiguration.VF_MODULES_METADATA.equals(elementInfoFromVfResource.getType()));

+		assertEquals(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name(), elementInfoFromVfResource.getType());

+

+		assertFalse(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));

+		elementInfoFromVfResource.addElementInfo("MyInfo1", "someValue");

+		assertTrue(elementInfoFromVfResource.toString().contains("MyInfo1: someValue"));

+	}

+

+	@Test

+	public void createASDCElementInfoFromVfModuleTest() throws ArtifactInstallerException {

+

+		String resourceInstanceName = "Resource 1";

+

+		UUID generatedUUID = UUID.randomUUID();

+

+		INotificationData notificationData = Mockito.mock(INotificationData.class);

+		IResourceInstance resourceInstance = Mockito.mock(IResourceInstance.class);

+

+		Mockito.when(resourceInstance.getResourceInstanceName()).thenReturn(resourceInstanceName);

+		Mockito.when(resourceInstance.getResourceInvariantUUID()).thenReturn(generatedUUID.toString());

+

+		VfResourceStructure vfResourceStructure = new VfResourceStructure(notificationData, resourceInstance);

+

+		// Create module structure now

+

+		String vfModuleModelName = "Module Model XYZ";

+

+		UUID generatedUUIDForModule = UUID.randomUUID();

+

+		IVfModuleData moduleMetadata = Mockito.mock(IVfModuleData.class);

+		Mockito.when(moduleMetadata.getVfModuleModelName()).thenReturn(vfModuleModelName);

+		Mockito.when(moduleMetadata.getVfModuleModelInvariantUUID()).thenReturn(generatedUUIDForModule.toString());

+		Mockito.when(moduleMetadata.getArtifacts()).thenReturn(Collections.<String> emptyList());

+

+		VfModuleStructure vfModuleStructure = new VfModuleStructure(vfResourceStructure, moduleMetadata);

+

+		ASDCElementInfo elementInfoFromVfModule = ASDCElementInfo.createElementFromVfModuleStructure(vfModuleStructure);

+

+		assertTrue(elementInfoFromVfModule.toString().contains(vfModuleModelName));

+		assertTrue(elementInfoFromVfModule.toString().contains(generatedUUIDForModule.toString()));

+

+		assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromVfModule.getType()));

+		assertEquals(ASDCConfiguration.VF_MODULES_METADATA, elementInfoFromVfModule.getType());

+

+		assertFalse(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));

+		elementInfoFromVfModule.addElementInfo("MyInfo2", "someValue");

+		assertTrue(elementInfoFromVfModule.toString().contains("MyInfo2: someValue"));

+	}

+

+	@Test

+	public void createASDCElementInfoFromArtifact() {

+		for (String eVal : ASDCConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST) {

+			String generatedArtifactName = eVal + " 1";

+			UUID generatedUUIDForArtifact = UUID.randomUUID();

+

+			IArtifactInfo artifactInfo = Mockito.mock(IArtifactInfo.class);

+			Mockito.when(artifactInfo.getArtifactType()).thenReturn(eVal);

+			Mockito.when(artifactInfo.getArtifactName()).thenReturn(generatedArtifactName);

+			Mockito.when(artifactInfo.getArtifactUUID()).thenReturn(generatedUUIDForArtifact.toString());

+

+			ASDCElementInfo elementInfoFromArtifact = ASDCElementInfo.createElementFromVfArtifactInfo(artifactInfo);

+

+			assertTrue(elementInfoFromArtifact.toString().contains(generatedArtifactName));

+			assertTrue(elementInfoFromArtifact.toString().contains(generatedUUIDForArtifact.toString()));

+

+			assertFalse(ASDCElementInfo.ASDCElementTypeEnum.VNF_RESOURCE.name().equals(elementInfoFromArtifact.getType()));

+			assertEquals(eVal, elementInfoFromArtifact.getType());

+

+			assertFalse(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));

+			elementInfoFromArtifact.addElementInfo("MyInfo3", "someValue");

+			assertTrue(elementInfoFromArtifact.toString().contains("MyInfo3: someValue"));

+		}

+	}

+}