Merge "Fix serialize DelegateExecutionImpl object bug"

[so.git] / asdc-controller / src / main / java / org / onap / so / asdc / installer / ToscaResourceStructure.java

diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java
index c7c6eca..3efc503 100644 (file)
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/ToscaResourceStructure.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -21,6 +23,7 @@
 package org.onap.so.asdc.installer;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.List;
 
 import org.onap.sdc.api.notification.IArtifactInfo;
@@ -40,18 +43,28 @@ import org.onap.so.db.catalog.beans.NetworkCollectionResourceCustomization;
 import org.onap.so.db.catalog.beans.NetworkInstanceGroup;
 import org.onap.so.db.catalog.beans.NetworkResource;
 import org.onap.so.db.catalog.beans.NetworkResourceCustomization;
+import org.onap.so.db.catalog.beans.PnfResourceCustomization;
 import org.onap.so.db.catalog.beans.Service;
-import org.onap.so.db.catalog.beans.ServiceProxyResource;
 import org.onap.so.db.catalog.beans.ServiceProxyResourceCustomization;
 import org.onap.so.db.catalog.beans.TempNetworkHeatTemplateLookup;
 import org.onap.so.db.catalog.beans.ToscaCsar;
 import org.onap.so.db.catalog.beans.VfModule;
 import org.onap.so.db.catalog.beans.VfModuleCustomization;
 import org.onap.so.db.catalog.beans.VnfResourceCustomization;
+import org.onap.so.logger.ErrorCode;
 import org.onap.so.logger.MessageEnum;
-import org.onap.so.logger.MsoLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 
 public class ToscaResourceStructure {
+
+       protected static final Logger logger = LoggerFactory.getLogger(ToscaResourceStructure.class);
+
+       /**
+        * mso config path, used for the config files, like download csar files.
+        */
+       private String msoConfigPath;
        
        Metadata serviceMetadata;
        private Service catalogService;
@@ -82,9 +95,7 @@ public class ToscaResourceStructure {
        private CollectionResourceCustomization catalogCollectionResourceCustomization;
        
        private NetworkCollectionResourceCustomization catalogNetworkCollectionResourceCustomization;
-       
-       private ServiceProxyResource catalogServiceProxyResource;
-       
+               
        private ServiceProxyResourceCustomization catalogServiceProxyResourceCustomization;
        
        private ConfigurationResource catalogConfigurationResource;
@@ -96,10 +107,10 @@ public class ToscaResourceStructure {
        private VfModule vfModule;
        
        private VfModuleCustomization vfModuleCustomization;
-       
-       //private VnfResource vnfResource;
-       
+
        private VnfResourceCustomization vnfResourceCustomization;
+
+       private PnfResourceCustomization pnfResourceCustomization;
                
        private AllottedResource allottedResource;
        
@@ -111,35 +122,36 @@ public class ToscaResourceStructure {
        
        private ToscaCsar toscaCsar;
        
-       protected static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.ASDC, ToscaResourceStructure.class);
-               
-       
        public ToscaResourceStructure(){
+               this(System.getProperty("mso.config.path"));
        }
-       
+
+       public ToscaResourceStructure(final String msoConfigPath){
+               this.msoConfigPath = msoConfigPath;
+               logger.info("MSO config path is: {}", msoConfigPath);
+       }
+
        public void updateResourceStructure(IArtifactInfo artifact) throws ASDCDownloadException {
-               
-                               
+
                try {
-                               
                        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();//Autoclosable
-                       
-                       LOGGER.debug("MSO config path is: " + System.getProperty("mso.config.path"));
-                       
-                       String filePath = System.getProperty("mso.config.path") + "/ASDC/" + artifact.getArtifactVersion() + "/" + artifact.getArtifactName();
+
+                       String filePath = Paths.get(msoConfigPath, "ASDC",  artifact.getArtifactVersion(), artifact.getArtifactName()).normalize().toString();
 
                        File spoolFile = new File(filePath);
- 
-                       LOGGER.debug("ASDC File path is: " + spoolFile.getAbsolutePath());
-                       LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***PATH", "ASDC", spoolFile.getAbsolutePath());
-                       
+
+                       logger.debug("ASDC File path is: {}", spoolFile.getAbsolutePath());
+                       logger.info("{} {} {} {}", MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF.toString(), "***PATH", "ASDC",
+                               spoolFile.getAbsolutePath());
 
                        sdcCsarHelper = factory.getSdcCsarHelper(spoolFile.getAbsolutePath(),false);
 
                }catch(Exception e){
-                       System.out.println("System out " + e.getMessage());
-                       LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,
-                                       "Exception caught during parser *****LOOK********* " + artifact.getArtifactName(), "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);
+                       logger.debug(e.getMessage(), e);
+                       logger.error("{} {} {} {} {} {}", MessageEnum.ASDC_GENERAL_EXCEPTION_ARG.toString(),
+                               "Exception caught during parser *****LOOK********* " + artifact.getArtifactName(), "ASDC",
+                               "processResourceNotification", ErrorCode.BusinessProcesssError.getValue(),
+                               "Exception in " + "processResourceNotification", e);
                        
                        throw new ASDCDownloadException ("Exception caught when passing the csar file to the parser ", e);
                }       
@@ -257,6 +269,15 @@ public class ToscaResourceStructure {
                this.vnfResourceCustomization = vnfResourceCustomization;
        }
 
+       public PnfResourceCustomization getPnfResourceCustomization() {
+               return pnfResourceCustomization;
+       }
+
+       public void setPnfResourceCustomization(PnfResourceCustomization pnfResourceCustomization) {
+               this.pnfResourceCustomization = pnfResourceCustomization;
+       }
+
+
        public VfModuleCustomization getCatalogVfModuleCustomization() {
                return vfModuleCustomization;
        }
@@ -442,14 +463,6 @@ public class ToscaResourceStructure {
                this.catalogNetworkCollectionResourceCustomization = catalogNetworkCollectionResourceCustomization;
        }
 
-       public ServiceProxyResource getCatalogServiceProxyResource() {
-               return catalogServiceProxyResource;
-       }
-
-       public void setCatalogServiceProxyResource(ServiceProxyResource catalogServiceProxyResource) {
-               this.catalogServiceProxyResource = catalogServiceProxyResource;
-       }
-
        public ServiceProxyResourceCustomization getCatalogServiceProxyResourceCustomization() {
                return catalogServiceProxyResourceCustomization;
        }
@@ -484,10 +497,6 @@ public class ToscaResourceStructure {
                this.toscaCsar = toscaCsar;
        }
 
-       public static MsoLogger getLogger() {
-               return LOGGER;
-       }
-       
        public boolean isDeployedSuccessfully() {
                return isDeployedSuccessfully;
        }