Merge "save csar file path add directory version"

diff --combined asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
index fae3a49,0af1ded..ee329ce
--- 1/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
--- 2/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/client/ASDCController.java
@@@ -22,6 -22,7 +22,7 @@@ d * ============LICENSE_START==========
  package org.onap.so.asdc.client;
  
  
+ import java.io.File;
  import java.io.FileOutputStream;
  import java.io.IOException;
  import java.io.UnsupportedEncodingException;
@@@ -268,7 -269,7 +269,7 @@@ public class ASDCController 
  
     
  
 -    private IDistributionClientDownloadResult downloadTheArtifact (IArtifactInfo artifact,
 +    protected IDistributionClientDownloadResult downloadTheArtifact (IArtifactInfo artifact,
                                                                     String distributionId) throws ASDCDownloadException {
  
          LOGGER.debug ("Trying to download the artifact : " + artifact.getArtifactURL ()
@@@ -352,9 -353,17 +353,17 @@@
                        + artifact.getArtifactUUID ()
                        + ")");
        
+       String filePath = System.getProperty("mso.config.path") + "/ASDC" + "/" + artifact.getArtifactVersion() + "/" + artifact.getArtifactName();
+       // make parent directory
+       File file = new File(filePath);         
+       File fileParent = file.getParentFile();
+       if (!fileParent.exists()) {
+           fileParent.mkdirs();
+       }
+ 
        byte[] payloadBytes = resultArtifact.getArtifactPayload();
        
-       try (FileOutputStream outFile = new FileOutputStream(System.getProperty("mso.config.path") + "/ASDC" + "/" + artifact.getArtifactName())) {
+       try (FileOutputStream outFile = new FileOutputStream(filePath)) {
                LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***WRITE FILE ARTIFACT NAME", "ASDC", artifact.getArtifactName());
                outFile.write(payloadBytes, 0, payloadBytes.length);
                outFile.close();
@@@ -370,7 -379,7 +379,7 @@@
      }
  
  
 -    private void sendDeployNotificationsForResource(VfResourceStructure vfResourceStructure,DistributionStatusEnum distribStatus, String errorReason) {
 +    protected void sendDeployNotificationsForResource(VfResourceStructure vfResourceStructure,DistributionStatusEnum distribStatus, String errorReason) {
  
        for (IArtifactInfo artifactInfo : vfResourceStructure.getResourceInstance().getArtifacts()) {
  
@@@ -397,7 -406,7 +406,7 @@@
        }
      }
      
 -    private void sendCsarDeployNotification(INotificationData iNotif, VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure, boolean deploySuccessful, String errorReason) {
 +    protected void sendCsarDeployNotification(INotificationData iNotif, VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure, boolean deploySuccessful, String errorReason) {
        
                IArtifactInfo csarArtifact = toscaResourceStructure.getToscaArtifact();
                
@@@ -424,7 -433,7 +433,7 @@@
                }
      }
      
 -    private void deployResourceStructure (VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure) throws ArtifactInstallerException {
 +    protected void deployResourceStructure (VfResourceStructure resourceStructure, ToscaResourceStructure toscaResourceStructure) throws ArtifactInstallerException {
  
        LOGGER.info (MessageEnum.ASDC_START_DEPLOY_ARTIFACT, resourceStructure.getResourceInstance().getResourceInstanceName(), resourceStructure.getResourceInstance().getResourceUUID(), "ASDC");
          try {
@@@ -459,7 -468,7 +468,7 @@@
        DOWNLOAD, DEPLOY
      }
  
 -    private void sendASDCNotification (NotificationType notificationType,
 +    protected void sendASDCNotification (NotificationType notificationType,
                                         String artifactURL,
                                         String consumerID,
                                         String distributionID,
@@@ -515,7 -524,7 +524,7 @@@
          LOGGER.recordMetricEvent (subStarttime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully sent notification to ASDC", "ASDC", action, null);
      }
      
 -    private void sendFinalDistributionStatus (
 +    protected void sendFinalDistributionStatus (
                String distributionID,
                DistributionStatusEnum status,
                String errorReason) {
@@@ -664,7 -673,7 +673,7 @@@
          }
      }
  
 -    private void processResourceNotification (INotificationData iNotif) {
 +    protected void processResourceNotification (INotificationData iNotif) {
        // For each artifact, create a structure describing the VFModule in a ordered flat level
        VfResourceStructure resourceStructure = null;
        ToscaResourceStructure toscaResourceStructure = new ToscaResourceStructure();
@@@ -735,7 -744,7 +744,7 @@@
                                "Exception caught during Installation of artifact", "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);
        }
      }
 -    private void processCsarServiceArtifacts (INotificationData iNotif, ToscaResourceStructure toscaResourceStructure) {
 +    protected void processCsarServiceArtifacts (INotificationData iNotif, ToscaResourceStructure toscaResourceStructure) {
        
        List<IArtifactInfo> serviceArtifacts = iNotif.getServiceArtifacts();
        
@@@ -768,7 -777,7 +777,7 @@@
      }
      
      private static final String UNKNOWN="Unknown";
 -
 +    
      /**
       * @return the address of the ASDC we are connected to.
       */

diff --combined bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
index bb2ad95,e4bd2f1..35bd25f
--- 1/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
--- 2/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/resource/ResourceRequestBuilder.java
@@@ -55,9 -55,9 +55,9 @@@ import com.google.gson.reflect.TypeToke
  
  public class ResourceRequestBuilder {
  
 -    public static String CUSTOMIZATION_UUID = "customizationUUID";
 +    private static String CUSTOMIZATION_UUID = "customizationUUID";
  
 -    public static String SERVICE_URL_TOSCA_CSAR = "/v3/serviceToscaCsar?serviceModelUuid=";
 +    private static String SERVICE_URL_TOSCA_CSAR = "/v3/serviceToscaCsar";
  
      private static MsoLogger LOGGER = MsoLogger.getMsoLogger(MsoLogger.Catalog.RA, ResourceRequestBuilder.class);
  
@@@ -184,14 -184,16 +184,16 @@@
  
      private static String getCsarFromUuid(String uuid) throws Exception {
                String catalogEndPoint = UrnPropertiesReader.getVariable("mso.catalog.db.endpoint");
 -      HttpClient client = new HttpClient(UriBuilder.fromUri(catalogEndPoint + SERVICE_URL_TOSCA_CSAR + uuid).build().toURL(), "application/json", TargetEntity.CATALOG_DB);
 +      HttpClient client = new HttpClient(UriBuilder.fromUri(catalogEndPoint).path(SERVICE_URL_TOSCA_CSAR).queryParam("serviceModelUuid", uuid).build().toURL(), "application/json", TargetEntity.CATALOG_DB);
        
          Response response = client.get();
          String value = response.readEntity(String.class);
  
          HashMap<String, String> map = new Gson().fromJson(value, new TypeToken<HashMap<String, String>>() {}.getType());
  
-         File csarFile = new File(System.getProperty("mso.config.path") + "ASDC/" + map.get("name"));
+         String filePath = System.getProperty("mso.config.path") + "ASDC/" +  map.get("version") + "/" + map.get("name");
+ 
+         File csarFile = new File(filePath);
  
          if(!csarFile.exists()) {
              throw new Exception("csar file does not exist.");